From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 22 Jun 2015 09:28:37 +0000 (+0200)
Subject: goto haystack 2.4 stable
X-Git-Tag: 1.6a~4^2~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a9c4fcdb51a9c55030729735900878862f10e428;p=telemeta.git

goto haystack 2.4 stable
---

diff --git a/requirements.txt b/requirements.txt
index 36a91dc8..a4baae86 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,4 @@
 setuptools
 -e .
 -e git+https://github.com/mariocesar/sorl-thumbnail#egg=sorl-thumbnail-12.2
--e git+https://github.com/django-haystack/django-haystack#egg=django-haystack-2.4
 -e git+https://github.com/Parisson/ebooklib#egg=ebooklib-0.16
diff --git a/setup.py b/setup.py
index eb1b8669..7835deb7 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(
         'django-suit',
         'django-google-tools',
         'django-ipauth',
+        'django-haystack',
         'timeside>=0.7',
         'south',
         'docutils',