Will Daly 96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py

2013-08-21 10:12:24 -04:00

..

djangoapps

Merge branch 'master' into will/use-mixed-modulestore-in-tests

2013-08-21 10:12:24 -04:00

lib

Merge branch 'master' into will/use-mixed-modulestore-in-tests

2013-08-21 10:12:24 -04:00

static

switch from log_event to Logger.log

2013-08-20 16:52:18 -04:00

templates

gst integration into studio

2013-07-26 17:22:27 +03:00

test

add a try catch around the staticstorage lookup, which can throw an exception

2013-08-17 10:33:59 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…