From: Marcin Koziej <marcin@lolownia.org>
Date: Thu, 12 Apr 2012 09:06:08 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/2c968d7bbf97b820439c6a997de08cc3411abb07?hp=-c

Merge branch 'master' of https://github.com/fnp/wolnelektury
---

2c968d7bbf97b820439c6a997de08cc3411abb07
diff --combined wolnelektury/settings/__init__.py
index ed7bda0f4,f2314a9ad..15126b9a4
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@@ -53,7 -53,6 +53,6 @@@ INSTALLED_APPS_OUR = 
      'dictionary',
      'infopages',
      'lesmianator',
-     #'lessons',
      'newtagging',
      'opds',
      'pdcounter',
@@@ -64,7 -63,6 +63,7 @@@
      'picture',
      'social',
      'waiter',
 +    'search',
      ]
  
  INSTALLED_APPS_CONTRIB = [
@@@ -75,7 -73,9 +74,9 @@@
      'django.contrib.sites',
      'django.contrib.admin',
      'django.contrib.admindocs',
+     'django.contrib.staticfiles',
      'pagination',
+     'pipeline',
      'piston',
      'piwik.django',
      #'rosetta',
@@@ -97,7 -97,6 +98,6 @@@
      #'allauth.twitter',
  
      # included
-     'compress',
      'modeltranslation',
      ]