yakky / django-cms

84%

develop: 71%

LAST BUILD ON BRANCH merge/3.0.x

branch: merge/3.0.x

CHANGE BRANCH

x

Reset

• merge/3.0.x
• _merged/3.0/feature/admin_edit_title
• _merged/3.0/feature/api_docs_fixes
• _merged/3.0/feature/django_16_reb
• _merged/3.0/feature/fix_2250
• _merged/3.0/feature/stacks_changelog
• _merged/3.0/selenium-travis
• _merged/3.1/feature/drop_1.5
• _merged/feature/no_selenium_on_travis
• _tmp/feature/django_16_reb
• blueprint_unbundled_30
• demo/toolbar_changelist
• feature/308
• feature/check_middlewares
• feature/cleanup_migrations
• feature/django_18
• feature/django_1_112
• feature/docs_installation
• feature/fix_appconfig_select
• feature/show_edit_model_icon
• future/appspaced_apphooks
• master+
• merge/3604
• release/3.0.6
• release/3.1.2
• remerge_3014
• reversion
• tmp/misc_test_branch
• try

Build # 1435

Build Type

push

travis-ci

Committed by yakky

Commit Message

Merge remote-tracking branch 'upstream/support/3.0.x' into merge/3.0.x

Conflicts:
	cms/__init__.py
	cms/menu.py
	cms/models/pagemodel.py
	cms/static/cms/js/modules/cms.modal.js
	cms/tests/frontend.py
	cms/tests/multilingual.py
	setup.py

Run Details

2312 of 2764 relevant lines covered (83.65%)

0.84 hits per line