Dennis Jen 17c2af2325 Merge pull request #6513 from edx/release ...

Merge release back into master

2015-01-09 09:15:57 -05:00

..

djangoapps

Merge pull request #6509 from edx/zoldak/fix-textbook-test

2015-01-09 07:45:05 -05:00

envs

Merge pull request #6513 from edx/release

2015-01-09 09:15:57 -05:00

lib

Studio render XBlockAside views

2014-12-17 15:44:49 -05:00

static

Merge pull request #6252 from edx/studio-move-branded

2015-01-08 12:42:40 -05:00

templates

Merge pull request #6252 from edx/studio-move-branded

2015-01-08 12:42:40 -05:00

__init__.py

…

.coveragerc

…

startup.py

…

urls_dev.py

…

urls.py

…

wsgi.py

…