From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 26 Sep 2017 12:37:46 +0000 (+0200)
Subject: Merge branch 'feature/dj1.9' of github.com:Parisson/Telemeta into feature/dj1.9
X-Git-Tag: 1.7.0~2^2~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=884d630bd15f97b4d8fd0a9d45d6f5da3d96aec7;p=telemeta.git

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

diff --git a/telemeta/__init__.py b/telemeta/__init__.py
index 8b4c92fc..8c5c4b16 100644
--- a/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@ -15,7 +15,7 @@ U{http://telemeta.org}
 """
 
 __docformat__ = 'epytext en'
-__version__ = '1.6.4'
+__version__ = '1.7.0'
 __url__ = 'http://telemeta.org'
 __copyright__ = '(C) 2006-2017 Parisson SARL'
 __license__ = 'AGPLv3'