Don Mitchell a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2012-11-19 16:00:27 -05:00

..

djangoapps

Batch together alter statements to minimize how long we lock the auth_users table

2012-11-19 10:30:22 -05:00

lib

Cleaned up imports

2012-11-19 10:38:58 -05:00

static

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00

templates

Make rake commands to run jasmine tests in browser and via phantomjs

2012-10-30 10:41:02 -04:00

test

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00