cahrens f91060d197 Merge branch 'master' into feature/cas/manual-policy ...

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

2013-02-19 13:27:35 -05:00

..

settings

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

2013-02-19 13:27:35 -05:00

__init__.py

Move models from common to cms.

2012-12-03 12:20:15 -05:00