cms/djangoapps/contentstore/tests · e157fd26c85cd6350ff23d38cd1e98bc82bb89ca · edx / edx-platform

Merge branch 'master' into feature/cas/manual-policy · f91060d1

Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py

committed Feb 19, 2013

f91060d1

Name	Last commit	Last update
..
__init__.py		Loading commit data...
factories.py		Loading commit data...
test_contentstore.py		Loading commit data...
test_core_caching.py		Loading commit data...
test_course_settings.py		Loading commit data...
test_course_updates.py		Loading commit data...
test_utils.py		Loading commit data...
tests.py		Loading commit data...
utils.py		Loading commit data...