Change JSONField implementation

[edumed.git] / edumed / settings.d / 50-static.py

diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py
index 780ce01..43dbb7c 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -27,6 +27,7 @@ PIPELINE_CSS = {
           'jquery/colorbox/colorbox.css',
 
           'css/forum.scss',
           'jquery/colorbox/colorbox.css',
 
           'css/forum.scss',

+          'css/mil.scss'

         ),
         'output_filename': 'compressed/base.css',
     },
         ),
         'output_filename': 'compressed/base.css',
     },


@@ -42,7 +43,7 @@ PIPELINE_JS = {
             'catalogue/js/lesson.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',
             'catalogue/js/lesson.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',

-
+            'js/formset.js',

             'pybb/js/pybbjs.js',
         ),
         'output_filename': 'compressed/base.js',
             'pybb/js/pybbjs.js',
         ),
         'output_filename': 'compressed/base.js',