# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1570207649 -7200
# Node ID 459d682e39b5453c8b449289aac14d80806de1f0
# Parent  9c9786f9466f852defbdcf51eef5edd9a7067c97# Parent  665c4d3fb9a48debd41c41d4a20370f97c4c9fb0
Merged default into iso-areas branch.

diff -r 9c9786f9466f -r 459d682e39b5 .hgtags
--- a/.hgtags	Fri Oct 04 17:41:34 2019 +0200
+++ b/.hgtags	Fri Oct 04 18:47:29 2019 +0200
@@ -15,3 +15,4 @@
 aececbc3d04798d905e65196ac0870d081776ca2 v4-preview20190726
 b5619087e3e909645eeab9e3f198667692895382 v4-preview20190918
 8a6c410f6f03ca8f50022c11f17d0bb2b86215f5 v4-preview20190930
+a92239475590146dc6ad99fc4a3f4ced857c73f6 v4
diff -r 9c9786f9466f -r 459d682e39b5 client/package.json
--- a/client/package.json	Fri Oct 04 17:41:34 2019 +0200
+++ b/client/package.json	Fri Oct 04 18:47:29 2019 +0200
@@ -1,6 +1,6 @@
 {
   "name": "gemmajs",
-  "version": "4.0.0-dev",
+  "version": "4.1.0-dev",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "hg",