Chris Dodge cbe205328a Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master ...

Conflicts:
	cms/djangoapps/contentstore/views.py

2013-05-13 15:47:33 -04:00

..

djangoapps

keep migrations in djangoapp_comment_client

2013-05-10 12:58:00 -04:00

lib

Merge pull request #2018 from edx/fix/peter/numerical_infinite_bug

2013-05-13 11:08:54 -07:00

static

Updated Backbone.js and Underscore.js

2013-05-08 09:29:15 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

2013-03-11 11:27:49 -04:00

test

Merge pull request #1991 from edx/feature/vik/oe-tests

2013-05-13 10:49:33 -07:00

xml_cleanup.py

Pep8 autofixes

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