From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Tue, 13 Aug 2013 10:52:53 +0000 (+0200)
Subject: Merge branch 'master' into forum
X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/32ac950fc8d6ba7ef7ec4bf1c4b05f2ed25b02fd?ds=sidebyside;hp=--cc

Merge branch 'master' into forum
---

32ac950fc8d6ba7ef7ec4bf1c4b05f2ed25b02fd
diff --cc edumed/settings.d/30-apps.py
index bac06a1,521839b..824b44b
--- a/edumed/settings.d/30-apps.py
+++ b/edumed/settings.d/30-apps.py
@@@ -15,8 -15,7 +15,9 @@@ INSTALLED_APPS = 
      'haystack',
      'chunks',
      'contact',
 +    'pybb',
 +    'django_libravatar',
+     'sorl.thumbnail',
  
      'django.contrib.auth',
      'django.contrib.contenttypes',
diff --cc requirements.txt
index ea14e0b,3db2e26..c96b02c
--- a/requirements.txt
+++ b/requirements.txt
@@@ -29,6 -29,4 +29,8 @@@ django-sponsors>=1.1,<1.
  django-haystack>=2.0,<2.1
  pysolr>=3,<4
  
 +pybbm>=0.14,<0.15
- sorl-thumbnail>=11,<12
 +django-libravatar
++
+ sorl-thumbnail>=11,<12
++