development.md
5.34 KB
-
Merge branch 'master' into feature/cdodge/cms-master-merge3 · 08adf9c0
Conflicts: common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/modulestore/mongo.py common/lib/xmodule/xmodule/modulestore/search.py common/lib/xmodule/xmodule/modulestore/xml.py doc/development.md lms/envs/common.py
Chris Dodge committed