Don Mitchell 884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse ...

Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py

2013-03-22 16:56:31 -04:00

..

__init__.py

Moved settings models from common to cms

2012-11-30 10:42:23 -05:00

course_details.py

Don't make cms.djangoapps a python module

2013-03-15 10:50:46 -04:00

course_grading.py

Make default value for format setting None, and force lms and cms to be explicit about a string default

2013-03-12 10:16:14 -04:00

course_metadata.py

Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse

2013-03-22 16:56:31 -04:00