e0d 86e3391b41 fixing merge conflict from release

2013-12-19 16:34:25 -05:00

..

djangoapps

BLD-206: Add template for the zooming image in Studio.

2013-12-19 21:47:32 +02:00

envs

fixing merge conflict from release

2013-12-19 16:34:25 -05:00

static

BLD-206: Add template for the zooming image in Studio.

2013-12-19 21:47:32 +02:00

templates

BLD-506: Update behavior of start/end time fields.

2013-12-18 09:43:11 +02:00

__init__.py

…

.coveragerc

…

startup.py

…

urls_dev.py

…

urls.py

…

wsgi.py

…

xmodule_namespace.py

…