From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 17 Apr 2015 16:21:01 +0000 (+0200)
Subject: Merge branch 'dev' into feature/haystack
X-Git-Tag: 1.6a^2~18^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4af19af1ca551145cf98a0941b57e86af7259de3;p=telemeta.git

Merge branch 'dev' into feature/haystack

Conflicts:
	setup.py
---

4af19af1ca551145cf98a0941b57e86af7259de3
diff --cc examples/sandbox/settings.py
index 278a44cd,0b02f2d2..bc90e5d6
--- a/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@@ -159,9 -159,9 +159,10 @@@ INSTALLED_APPS = 
      'bootstrap_pagination',
      'googletools',
      'registration',
+     'epub',
      'rest_framework',
      'djcelery',
 +    'haystack',
  )
  
  TEMPLATE_CONTEXT_PROCESSORS = (
diff --cc setup.py
index d62ede84,4dfdbefa..386b357c
--- a/setup.py
+++ b/setup.py
@@@ -73,7 -72,7 +73,8 @@@ setup
          'pyyaml',
          'python-ebml',
          'zipstream',
 +        'elasticsearch',
+         'ebooklib',
      ],
    tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
    # Provide a test command through django-setuptest