cahrens c95b44d851 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-05-23 11:41:12 -04:00

..

feedback_spec.coffee

Unify system feedback templates

2013-05-22 15:55:55 -04:00

metadata_spec.coffee

Jasmine test for metadata model.

2013-05-20 16:26:48 -04:00

module_spec.coffee

Clean old javascript tests from CAS

2012-10-31 13:21:36 -04:00

section_spec.coffee

Fix test

2013-05-22 15:55:53 -04:00