Adam Palay 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master ...

Conflicts:
	common/test/acceptance/tests/video/test_video_times.py

2015-05-08 10:23:04 -04:00

..

contentstore

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

2015-05-08 10:23:04 -04:00

course_creators

Add missing __init__.py files

2015-04-30 07:43:08 -04:00

models

Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-require-meaningful-title

2015-04-16 13:54:15 +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