Ned Batchelder 1cbc171616 Merge master in prep for merging back the hotfix changes.

2013-12-05 15:48:49 -05:00

..

djangoapps

Merge master in prep for merging back the hotfix changes.

2013-12-05 15:48:49 -05:00

lib

Merge pull request #1814 from edx/adam/fix-ora-typo

2013-12-05 07:37:52 -08:00

static

mitx_markdown => edx_markdown

2013-12-04 10:23:47 -05:00

templates

remove unused jasmine resources

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

test

fix typo in ORA template (ORA-136)

2013-12-03 14:35:20 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…