cms/djangoapps/models/settings · 754e30240d7c62c7efd80c38d552c4d168d23262 · edx / edx-platform · GitLab

History Find file

Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse · 884019b1
```
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
```
Don Mitchell committed Mar 22, 2013
884019b1

Name	Last commit	Last update
..
__init__.py		Loading commit data...
course_details.py		Loading commit data...
course_grading.py		Loading commit data...
course_metadata.py		Loading commit data...