Merge branch 'release'

2014-03-27 14:11:57 -04:00
parent 0e2e19e066 5f9ef9a402
commit ba8faeadb4
374 changed files with 43517 additions and 8242 deletions
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -60,6 +60,7 @@ else:
        'word_cloud',
        'graphical_slider_tool',
        'lti',
+        'concept',
        'openassessment',  # edx-ora2
    ] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES