From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 24 Jan 2017 16:23:01 +0000 (+0100)
Subject: Merge branch 'feature/dj1.8' of github.com:Parisson/Telemeta into feature/dj1.8
X-Git-Tag: 1.7.0~2^2~25
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1dd787d47bd783b20495ec1dadd3fa71361e61f4;p=telemeta.git

Merge branch 'feature/dj1.8' of github.com:Parisson/Telemeta into feature/dj1.8
---

1dd787d47bd783b20495ec1dadd3fa71361e61f4
diff --cc setup.py
index 767322d8,815d3c2e..2465a332
--- a/setup.py
+++ b/setup.py
@@@ -47,9 -47,9 +47,9 @@@ setup
    long_description = open('README.rst').read(),
    author = "Guillaume Pellerin",
    author_email = "yomguy@parisson.com",
 -  version = '1.6.3',
 +  version = '1.7.0',
    install_requires = [
-         'django==1.8.17',
+         'django==1.9.*',
          'django-registration-redux',
          'django-extensions',
          'django-timezones',