4 Commits

Author	SHA1	Message	Date
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
Chris Dodge	7229a9cdaf	perform a new merge from master, resolve conflicts	2013-01-03 10:43:03 -05:00
Calen Pennington	4381674ec5	Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms	2012-10-01 15:17:40 -04:00
Calen Pennington	d240b5b1eb	Consolidate bourbon and link to it from both cms and lms	2012-10-01 15:17:40 -04:00