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

lib

Remove tags for comment client request time histogram in Datadog

2013-05-22 14:12:25 -04:00

static

Merge pull request #13 from edx/victor/help-button-text

2013-06-02 20:47:45 -07:00

templates

Fix merge conflict.

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

__init__.py

…

.coveragerc

…

CHANGELOG.md

…

one_time_startup.py

ummm. forgot to commit stuff

2013-03-27 22:51:52 -04:00

urls.py

removing the request debugger entirely.

2013-05-31 11:15:28 -04:00

wsgi.py

…

xmodule_namespace.py

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00