From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Tue, 8 Oct 2013 09:48:42 +0000 (+0200)
Subject: Merge branch 'forum'
X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/42c42960c2dce4500f12dd14a68a10ed4f06abf5?ds=inline;hp=--cc

Merge branch 'forum'
---

42c42960c2dce4500f12dd14a68a10ed4f06abf5
diff --cc edumed/settings.d/50-static.py
index b6d9591,780ce01..4d75c9a
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@@ -40,7 -42,8 +42,8 @@@ PIPELINE_JS = 
              'catalogue/js/lesson.js',
              'sponsors/js/sponsors.js',
              'curriculum/curriculum.js',
 -
 +            'js/formset.js',
+             'pybb/js/pybbjs.js',
          ),
          'output_filename': 'compressed/base.js',
      },
diff --cc requirements.txt
index cf1dfa8,c96b02c..49b1e28
--- a/requirements.txt
+++ b/requirements.txt
@@@ -29,5 -29,8 +29,9 @@@ django-sponsors>=1.1,<1.
  django-haystack>=2.0,<2.1
  pysolr>=3,<4
  
+ pybbm>=0.14,<0.15
+ django-libravatar
+ 
  sorl-thumbnail>=11,<12
 +pyyaml
+