Christina Roberts f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages ...

Make sure to get the correct modulestore on delete (static tabs do not e...

2013-05-17 09:59:59 -07:00

..

djangoapps

Merge master to here.

2013-05-16 14:21:51 -04:00

lib

Merge pull request #2061 from edx/bug/christina/static-pages

2013-05-17 09:59:59 -07:00

static

update annotator.js library and fix the annotator-adder button hover state in courseware.

2013-05-16 14:27:21 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

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

test

Merge master to here.

2013-05-16 14:21:51 -04:00

xml_cleanup.py

Pep8 autofixes

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