Merge remote-tracking branch 'origin/filmowa' into filmowa

[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 f2924eb..c667c32 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -25,6 +25,7 @@ PIPELINE_CSS = {
           'catalogue/css/section_list.scss',
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',
           'catalogue/css/section_list.scss',
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',

+          'fnpdjango/annoy/annoy.css',

 
           'css/forum.scss',
           'css/mil.scss'
 
           'css/forum.scss',
           'css/mil.scss'


@@ -47,6 +48,7 @@ PIPELINE_JS = {
             'curriculum/curriculum.js',
             'js/formset.js',
             'pybb/js/pybbjs.js',
             'curriculum/curriculum.js',
             'js/formset.js',
             'pybb/js/pybbjs.js',

+            'fnpdjango/annoy/annoy.js',

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