Greg Price f0322b9662 Merge branch 'release'

2015-03-11 11:14:48 -04:00

..

contentstore

Merge branch 'release'

2015-03-11 11:14:48 -04:00

course_creators

s/pylint: disable=W0621/pylint: disable=redefined-outer-name/

2014-12-01 11:22:08 -05:00

models

Fix a number of incorrect translation string uses

2015-02-02 22:38:27 -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