Julia Hansbrough 2204eb7390 Fixed merge conflict between release and master.

2014-08-13 18:11:30 +00:00

..

djangoapps

Fixed merge conflict between release and master.

2014-08-13 18:11:30 +00:00

lib

Merge pull request #4759 from edx/dhm/key_munging

2014-08-13 09:36:08 -04:00

static

Studio: refactoring font-size to use existing Sass scale-based placeholders

2014-08-13 08:01:16 -04:00

templates

Toggle aria-expanded attribute

2014-08-06 09:59:48 -04:00

test

Improve stability of test_studio_outline tests.

2014-08-11 15:13:16 -04:00

.gitignore

…

xml_cleanup.py

…