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

..

course_authors

Add docs for changes in #726

2013-08-20 14:04:38 -04:00

data

Merge pull request #568 from edx/jkarni/fix/quietdocs

2013-08-19 07:48:34 -07:00

developers

Mock only if on RTD.

2013-08-19 10:24:52 -04:00

internal

add tests of static_asset_path and importing with no static;

2013-08-20 23:30:26 -04:00

shared

Update Babel and Transifex libraries

2013-08-02 15:19:35 -04:00

source

Merge branch 'master' into jkarni/docs-merge

2013-07-30 10:23:35 -04:00

__init__.py

Switch to common structure and shared resources

2013-07-16 13:01:12 -04:00

Makefile

Add verbose option

2013-08-06 14:00:31 -04:00