Allow day & hour statistics reset due to changing energy prices #95

dsmrreader · May 18, 2016 · 654fa09 · 654fa09
1 parent b42dd1a
commit 654fa09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,7 +2,7 @@ Changelog
 =========
 
 
-v1.2.0 - 2016-xx-xx
+v1.2.0 - 2016-05-20
 ^^^^^^^^^^^^^^^^^^^
 - Energy supplier prices does not indicate tariff type (Django admin) (`#126 <https://github.com/dennissiemensma/dsmr-reader/issues/126>`_).
 - Requirements update (`#128 <https://github.com/dennissiemensma/dsmr-reader/issues/128>`_).
@@ -13,7 +13,7 @@ v1.2.0 - 2016-xx-xx
 - Pie charts on trends page overlap their canvas (`#136 <https://github.com/dennissiemensma/dsmr-reader/issues/136>`_).
 - 'Slumber' consumption (`#115 <https://github.com/dennissiemensma/dsmr-reader/issues/115>`_).
 - Show lowest & highest Watt peaks (`#138 <https://github.com/dennissiemensma/dsmr-reader/issues/138>`_).
-- Reset day & hour statistics when changing energy prices (`#95 <https://github.com/dennissiemensma/dsmr-reader/issues/95>`_).
+- Allow day & hour statistics reset due to changing energy prices (`#95 <https://github.com/dennissiemensma/dsmr-reader/issues/95>`_).
 
 
 v1.1.2 - 2016-05-01

diff --git a/dsmrreader/__init__.py b/dsmrreader/__init__.py
@@ -17,6 +17,6 @@
 from django.utils.version import get_version
 
 
-VERSION = (1, 2, 0, 'beta', 10)
+VERSION = (1, 2, 0, 'final', 0)
 
 __version__ = get_version(VERSION)