Calen Pennington 8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-03-06 12:15:07 -05:00

..

features

make branch

2013-03-04 16:42:04 -05:00

management

Merge pull request #1586 from MITx/feature/cdodge/make-update-templates-django-admin-util

2013-03-04 13:11:46 -08:00

tests

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00

__init__.py

move call to update_templates on service startup into a django-admin command

2013-03-04 08:06:58 -05:00

course_info_model.py

Fix tests

2013-02-15 15:44:11 -05:00

module_info_model.py

Set up dev environment for testing xml vs mongo vs split_mongo modulestores

2013-02-13 14:04:21 -05:00

utils.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

views.py

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-06 12:15:07 -05:00