Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 ...

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

2013-01-07 12:34:48 -05:00

..

__init__.py

Add sub-environments for the lms that is running alongside the lms for debugging

2012-09-17 13:51:33 -04:00

acceptance.py

Smart accordion walkthrough working for cms-master branch

2013-01-02 10:44:19 -05:00

aws.py

Use the right config as the base for lms.envs.cms.aws

2012-10-11 12:31:52 -04:00

dev.py

add django performance metering

2012-11-02 15:08:45 -04:00

preview_dev.py

Add configs for lms and lms preview running against mongo

2012-10-10 12:49:52 -04:00