Calen Pennington ff026ea8af Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_handlers.py

2014-05-15 10:25:08 -04:00

..

djangoapps

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-15 10:25:08 -04:00

envs

Merge branch 'master' into release

2014-05-13 11:10:48 -04:00

lib

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-13 15:30:56 -04:00

static

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-14 10:00:16 -04:00

templates

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-14 15:57:38 -04:00

__init__.py

…

.coveragerc

…

startup.py

Fix bad interaction between pluggable InputTypes and Microsites

2014-04-01 16:49:15 -04:00

tests.py

Test TemplateLookup dirs are not cleared during lms startup.

2014-04-03 20:23:44 +05:00

urls.py

Change URL patterns for instructor dashboard

2014-05-12 10:18:28 -04:00

wsgi_apache_lms.py

apache lms wsgi fix

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

wsgi.py

Remove extraneous configuration

2014-02-04 15:35:26 -05:00