Diana Huang 1c2175304e Merge branch 'master' into drupal-new

2013-05-16 16:27:36 -04:00

..

djangoapps

Merge branch 'master' into drupal-new

2013-05-16 16:27:36 -04:00

lib

Merge pull request #1961 from edx/feature/cale/maintain-dev-environment

2013-05-15 12:36:36 -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 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