Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests

This commit is contained in:
Jay Zoldak
2012-11-16 15:10:19 -05:00
712 changed files with 1815 additions and 38739 deletions

View File

@@ -378,7 +378,7 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
entry_point = "xmodule.v1"
module_class = XModule
# Attributes for inpsection of the descriptor
# Attributes for inspection of the descriptor
stores_state = False # Indicates whether the xmodule state should be
# stored in a database (independent of shared state)
has_score = False # This indicates whether the xmodule is a problem-type.