Unstable state; need to merge from master

2012-05-31 13:44:45 -04:00
parent 9fdbdd3b73
commit 34dc32e5aa
11 changed files with 147 additions and 92 deletions
--- a/djangoapps/courseware/modules/schematic_module.py
+++ b/djangoapps/courseware/modules/schematic_module.py
@@ -6,6 +6,9 @@ from mitxmako.shortcuts import render_to_response, render_to_string

 from x_module import XModule

+class ModuleDescriptor(XModuleDescriptor):
+    pass
+
 class Module(XModule):
    id_attribute = 'id'