Adam Palay 89795191cb Merge remote-tracking branch 'origin/release' ...

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

2014-02-27 17:33:40 -05:00

..

acceptance

Add new container page that can display nested xblocks

2014-02-27 14:53:05 -05:00

data

update course info module to save content in new 'items' field + update import/export to handle content field other than 'data' or 'metadata'

2014-02-26 13:11:59 +05:00

db_cache

Update schema for bok-choy database

2014-02-27 10:27:29 -05:00

db_fixtures

Acceptance test for language selector

2014-02-14 10:32:11 -05:00

test_microsites/test_microsite

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00