e0d d52b959ff1 fixing merge conflicts

2013-12-16 15:02:14 -05:00

..

djangoapps

fixing merge conflicts

2013-12-16 15:02:14 -05:00

envs

Merge pull request #1954 from edx/dhm/loc_mapper_memoize

2013-12-16 10:34:12 -08:00

lib

Update handler_url support to match the latest in the xblock repo, for both js and python runtimes

2013-12-10 12:04:18 -05:00

static

Merge pull request #1882 from edx/gprice/remove-moderator-toggle

2013-12-10 07:40:39 -08:00

templates

fixing merge conflicts

2013-12-16 15:02:14 -05:00

__init__.py

…

.coveragerc

…

startup.py

Quiet down exceptions at startup, and during tests

2013-10-01 18:13:06 -04:00

urls.py

Add sysadmin dashboard

2013-12-15 19:06:05 -05:00

wsgi_apache_lms.py

apache lms wsgi fix

2013-09-16 21:46:57 -07:00

wsgi.py

Centralize startup code, and execute in all contexts

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