From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 9 Aug 2012 13:44:14 +0000 (+0200)
Subject: Merge branch 'oaipmh'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/6ff3ca2d4ba9d131d5a3a96e9f74573668980f0b?ds=sidebyside;hp=-c

Merge branch 'oaipmh'

Conflicts:
	requirements.txt
---

6ff3ca2d4ba9d131d5a3a96e9f74573668980f0b
diff --combined requirements.txt
index 5dffaadce,70cf8b993..f94a945c2
--- a/requirements.txt
+++ b/requirements.txt
@@@ -6,11 -6,11 +6,11 @@@ South>=0.7 # migrations for djang
  django-pipeline>=1.2
  django-pagination>=1.0
  django-maintenancemode>=0.10
- django-piston
+ django-piston<=0.2.3
  #django-jsonfield
  -e git+git://github.com/bradjasper/django-jsonfield.git@2f427368ad70bf8d9a0580df58ec0eb0654d62ae#egg=django-jsonfield
  django-picklefield
 -django-allauth<=0.4.0
 +django-allauth>=0.4,<0.5
  django-honeypot
  django-uni-form
  
@@@ -38,3 -38,8 +38,8 @@@ django-komb
  
  # spell checking
  pyenchant
+ 
+ # OAI-PMH
+ pyoai
+ 
+