Calen Pennington 240fcc1d5a Fix merge conflicts

2014-05-22 16:24:02 -04:00

..

djangoapps

Fix merge conflicts

2014-05-22 16:24:02 -04:00

envs

Allow creation of components on container page

2014-05-21 15:40:31 -04:00

lib

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

static

Fix merge conflicts

2014-05-22 16:24:02 -04:00

templates

Fix merge conflicts

2014-05-22 16:24:02 -04:00

__init__.py

…

.coveragerc

…

startup.py

Remove obselete cms startup code

2014-01-24 16:42:38 -05:00

urls_dev.py

Add the ability to view templates in a browser in development mode

2014-02-07 14:56:35 -05:00

urls.py

Fix ssl redirection test

2014-05-13 14:13:45 -04:00

wsgi.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00