Adam Palay 89795191cb Merge remote-tracking branch 'origin/release' ...

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

2014-02-27 17:33:40 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/release'

2014-02-27 17:33:40 -05:00

envs

Merge remote-tracking branch 'origin/release'

2014-02-27 17:33:40 -05:00

lib

Add test of local_resource_url in AcidBlock

2014-02-25 14:01:37 -05:00

static

adding a little styling to the language note on the LMS help modal

2014-02-27 15:32:56 -05:00

templates

Merge remote-tracking branch 'origin/release'

2014-02-27 17:33:40 -05:00

__init__.py

…

.coveragerc

…

startup.py

Merge pull request #2454 from ionis-education-group/theme-template-paths

2014-02-07 09:25:34 -05:00

urls.py

Merge remote-tracking branch 'origin/release'

2014-02-27 17:33:40 -05:00

wsgi_apache_lms.py

…

wsgi.py

…