christopher lee 212598e649 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/mobile_api/course_info/tests.py

2014-12-04 16:39:37 -05:00

..

djangoapps

Merge branch 'release'

2014-12-04 16:39:37 -05:00

lib

Merge pull request #6078 from edx/zoldak/modulestore-test-refactor

2014-12-02 08:53:41 -05:00

static

Merge pull request #5925 from stvstnfrd/pep8/continuation

2014-11-25 09:03:40 -05:00

templates

hotfix-2014-11-20

2014-11-20 12:00:19 -05:00

test

Merge pull request #5774 from edx/cdodge/shopping-cart-touchups

2014-12-04 14:02:19 -05:00

.gitignore

…

xml_cleanup.py

Fix PEP8: E125 continuation line

2014-11-24 20:46:44 -05:00