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

Conflicts:
	cms/djangoapps/contentstore/views/course.py

2015-06-12 16:22:06 -04:00

..

contentstore

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

2015-06-12 16:22:06 -04:00

course_creators

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

models

show credit eligibility requirements in studio

2015-06-12 13:19:57 +05:00

xblock_config

Add configuration to studio for asides

2014-12-18 14:43:22 -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