Ned Batchelder c8a7b259ff Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

..

djangoapps

Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00

lib

Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -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

Remove code related to Pearson Testing Centers

2013-11-26 17:04:19 -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