Commit Graph

4 Commits

Author SHA1 Message Date
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
Julian Arni
c0f6ec6cf5 Merge branch 'master' into jkarni/docs-merge
Conflicts:
	docs/source/conf.py
2013-07-30 10:23:35 -04:00
Julian Arni
bf60b24aa8 Switch to common structure and shared resources 2013-07-16 13:01:12 -04:00