Merge branch 'forum'

[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 b6d9591..4d75c9a 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -25,6 +25,8 @@ PIPELINE_CSS = {
           'catalogue/css/section_list.scss',
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',
+
+          'css/forum.scss',
         ),
         'output_filename': 'compressed/base.css',
     },
@@ -41,6 +43,7 @@ PIPELINE_JS = {
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',
             'js/formset.js',
+            'pybb/js/pybbjs.js',
         ),
         'output_filename': 'compressed/base.js',
     },