iOS Web App: prevent same-window links from being opened externally #398

docs/changelog.rst

@@ -18,6 +18,15 @@ Please make sure you have a fresh **database backup** before upgrading! Upgradin
 
 
 
+v1.12.0 - 2017-xx-xx
+^^^^^^^^^^^^^^^^^^^^
+
+**Tickets resolved in this release:**
+
+- [`#398 <https://github.com/dennissiemensma/dsmr-reader/issues/398>`_] iOS Web App: prevent same-window links from being opened externally - by jorisvervuurt
+
+
+
 v1.11.0 - 2017-11-24
 ^^^^^^^^^^^^^^^^^^^^
 

docs/credits.rst

@@ -11,12 +11,8 @@ Special thanks for supplying code contributions
 Also many thanks to the contributions (reporting) of
 ----------------------------------------------------
 Listed in any order, sorted by name.
-<<<<<<< HEAD
-
-=======
 
 - `allureGOT <https://github.com/allureGOT>`_
->>>>>>> refs/heads/378-duplicate-timestamp-handling
 - `balk77 <https://github.com/balk77>`_
 - `Bert-Jan Vos <https://www.linkedin.com/in/bert-jan-vos-82011712>`_
 - `dajappie <https://github.com/dajappie>`_
@@ -32,6 +28,7 @@ Listed in any order, sorted by name.
 - `HugoDaBosss <https://github.com/HugoDaBosss>`_
 - `Jelte Leijenaar <https://www.linkedin.com/in/jelteleijenaar>`_ 
 - `Jeroen Tielen <https://nl.linkedin.com/in/jeroentielen>`_
+- `jorisvervuurt <https://github.com/jorisvervuurt>`_
 - `ju5t <https://github.com/ju5t>`_
 - Koen Volleberg
 - `MarsWarrior <https://github.com/MarsWarrior>`_
@@ -51,7 +48,7 @@ Listed in any order, sorted by name.
 - `WatskeBart <https://github.com/WatskeBart>`_
 - `xirixiz <https://github.com/xirixiz>`_
 
-
+ 
 Software used
 -------------
 Please note and respect their licences as well, if any. Credits to the following software and projects:

dsmrreader/__init__.py

@@ -17,6 +17,6 @@
 from django.utils.version import get_version
 
 
-VERSION = (1, 11, 0, 'final', 0)
+VERSION = (1, 12, 0, 'beta', 1)
 
 __version__ = get_version(VERSION)