Christine Lytwynec 96e5139d66 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py

2014-06-25 13:51:31 -04:00

..

djangoapps

Merge branch 'release'

2014-06-25 13:51:31 -04:00

envs

Merge branch 'release'

2014-06-25 13:51:31 -04:00

lib

Review from Cale

2014-06-20 10:57:11 -04:00

static

Pass storage_url and token values as parameters to StudentNotes init.

2014-06-23 16:38:02 +05:00

templates

Merge branch 'release'

2014-06-25 13:51:31 -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

The LMS should serve favicon.ico also when a theme is enabled.

2014-06-18 14:33:11 +02: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