ichuang 0d938d3940 Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static ...

Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py

2013-08-20 23:40:09 -04:00

..

djangoapps

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-20 23:40:09 -04:00

lib

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-20 23:40:09 -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

Merge branch 'master' of github.com:edx/edx-platform into feature/ichuang/import-with-no-static

2013-08-20 23:40:09 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00