Ned Batchelder 368c5758a5 Fix CHANGELOG conflicts again.

2013-11-25 15:01:26 -05:00

..

djangoapps

Merged master to rc/2013-11-21

2013-11-25 14:56:09 -05:00

lib

Fix CHANGELOG conflicts again.

2013-11-25 15:01:26 -05:00

static

Add error recovery to inline discussion loading

2013-11-22 11:00:10 -05:00

templates

remove unused jasmine resources

2013-11-07 12:04:35 -05:00

test

Add two tests of problems-with-files

2013-11-22 11:47:33 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

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