4 Commits

Author	SHA1	Message	Date
Calen Pennington	fdd9663699	Merge remote-tracking branch 'origin/master' into dormsbee/multicourse ... Conflicts: common/lib/xmodule/xmodule/capa_module.py common/lib/xmodule/xmodule/modulestore/xml.py lms/djangoapps/courseware/views.py lms/templates/index.html lms/templates/info.html lms/templates/main.html lms/templates/navigation.html requirements.txt	2012-07-10 13:39:19 -04:00
ichuang	5688e89fab	change MITx -> edX in many lms templates	2012-06-28 10:26:59 -04:00
Matthew Mongeau	e00b7cb252	askbot stuff.	2012-06-14 16:46:07 -04:00
Calen Pennington	5ba03130aa	Moving LMS code into subdirectory	2012-06-06 14:09:01 -04:00