From e99a7ca0d58d0a1af788098db82532492087b3ed Mon Sep 17 00:00:00 2001
From: Ronan Dunklau <ronan.dunklau@dalibo.com>
Date: Fri, 27 Jan 2017 16:09:54 +0100
Subject: [PATCH] Prepare 3.1.1

---
 CHANGELOG        | 11 +++++++++++
 powa/__init__.py |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7f981a15..7446edfa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+3.1.1:
+  - Detect powa-archivist / powa-web incompatibility
+  - Handle quals which are not optimizable at all
+  - Fix grid rendering.
+  - Change default sorting order to DESC
+  - Change default sort order on query page to duration desc
+  - Use the time interval when rendering urls in Grids
+  - Propagate updatePeriod on zoom to picker
+  - Add export to CSV feature on grid
+  - Fix case when quals dont belong to the same rel
+  - Ignore errors while getting hypoplans
 3.1.0:
   - Fix figures in query details, thanks to Eric Champigny for the patch
   - Fix graphs to display local time instead of UTC time
diff --git a/powa/__init__.py b/powa/__init__.py
index f36b559c..5ddebc71 100644
--- a/powa/__init__.py
+++ b/powa/__init__.py
@@ -4,7 +4,7 @@
 """
 import os
 
-__VERSION__ = '3.1.0'
+__VERSION__ = '3.1.1'
 __VERSION_NUM__ = [int(part) for part in __VERSION__.split('.')]
 POWA_ROOT = os.path.dirname(__file__)