Peter Fogg 8c5f9e6e41 Fix merge conflict.

2013-06-03 08:49:52 -04:00

..

djangoapps

Fix merge conflict.

2013-06-03 08:49:52 -04:00

envs

Fix merge conflict.

2013-06-03 08:49:52 -04:00

static

hides latex compiler in settings tab by making previously specific css sibling selector general enough to find and hide the appropriate div

2013-06-02 12:48:54 -04:00

templates

Fix merge conflict.

2013-06-03 08:49:52 -04:00

__init__.py

…

.coveragerc

…

CHANGELOG.md

…

manage.py

…

one_time_startup.py

…

urls.py

Remove proof-of-concept page

2013-05-22 15:55:51 -04:00

xmodule_namespace.py

…