Adam Palay c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt

2016-01-26 11:25:41 -05:00

..

contentstore

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-01-26 11:25:41 -05:00

course_creators

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

models

Added CCXCon app

2016-01-20 10:47:37 -05:00

xblock_config

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

__init__.py

Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it

2014-12-12 21:45:21 -05:00