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

..

djangoapps

Move foldit app into the lms. No need for it in the cms, and it was breaking tests there..

2013-02-14 13:23:58 -05:00

lib

Merge pull request #1510 from MITx/bug/btalbot/html-strongspan

2013-02-19 09:09:47 -08:00

static

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

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

templates

saving work

2013-02-04 12:50:16 -05:00

test

Fix some issues with peer grading service

2013-02-05 13:37:55 -05:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00