Merge pull request #6459 from edx/content-libraries

Content libraries MVP
2015-01-13 11:20:20 -08:00
parent 2b9b531c16 bce8ee692f
commit 6be35e0fc1
132 changed files with 9358 additions and 1409 deletions
--- a/docs/shared/conf.py
+++ b/docs/shared/conf.py
@@ -22,7 +22,6 @@
 # -----------------------------------------------------------------------------

 import os
-import sys

 BASEDIR = os.path.dirname(os.path.abspath(__file__))