Jay Zoldak a620cc0004 Merge branch 'release' ...

Conflicts:
	lms/templates/courseware/accordion.html

2014-02-21 16:17:02 -05:00

..

djangoapps

Merge branch 'release'

2014-02-21 16:17:02 -05:00

envs

Merge branch 'release'

2014-02-21 16:17:02 -05:00

lib

Implement children for pure XBlocks in edx-platform

2014-02-21 15:01:20 -05:00

static

Implement children for pure XBlocks in edx-platform

2014-02-21 15:01:20 -05:00

templates

Merge branch 'release'

2014-02-21 16:17:02 -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

Refactor out new lang_pref djangoapp

2014-02-14 22:35:14 +00: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