Don Mitchell b6fac23960 Implement asset metadata storage in Split - per-asset functionality ...

PLAT-40

Conflicts:
	common/lib/xmodule/xmodule/assetstore/__init__.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

2014-10-27 10:04:09 -04:00

..

djangoapps

Merge branch 'release'

2014-10-23 19:41:31 +00:00

lib

Implement asset metadata storage in Split - per-asset functionality

2014-10-27 10:04:09 -04:00

static

Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33

2014-10-23 11:22:22 -04:00

templates

Merge pull request #5590 from cpennington/xblocks-with-children

2014-10-16 10:23:35 -04:00

test

Fix test page definition for course group configurations page

2014-10-24 14:30:31 -04:00

.gitignore

…

xml_cleanup.py

…