Merge pull request #3466 from lduarte1991/lduarte-harvardx

Reconnecting Token Generator for Annotation Tool
2014-05-09 16:14:42 -04:00
parent a454502b63 edeebe7bea
commit c0a5171c75
19 changed files with 176 additions and 464 deletions
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -318,7 +318,7 @@ PIPELINE_CSS = {
            'css/vendor/ui-lightness/jquery-ui-1.8.22.custom.css',
            'css/vendor/jquery.qtip.min.css',
            'js/vendor/markitup/skins/simple/style.css',
-            'js/vendor/markitup/sets/wiki/style.css'
+            'js/vendor/markitup/sets/wiki/style.css',
        ],
        'output_filename': 'css/cms-style-vendor.css',
    },