changeset 4783:f50589814636

Merged dev branch
author Sascha Wilde <wilde@intevation.de>
date Tue, 22 Oct 2019 17:56:33 +0200
parents fc082c611b8b (current diff) 37230b3dcf1f (diff)
children ecbb12a6e8ee
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 22 17:51:46 2019 +0200
+++ b/.hgtags	Tue Oct 22 17:56:33 2019 +0200
@@ -19,3 +19,4 @@
 415c1993c7fe1500d053269761f09aa5ef7b937c v4.1
 415c1993c7fe1500d053269761f09aa5ef7b937c v4.1
 340b375cf3a13a7d74327c560c7ab0aeef2813c0 v4.1
+eb310f7e53b0cdf3f54ffc79dbf546d2275a9259 v4.2
--- a/client/package.json	Tue Oct 22 17:51:46 2019 +0200
+++ b/client/package.json	Tue Oct 22 17:56:33 2019 +0200
@@ -1,6 +1,6 @@
 {
   "name": "gemmajs",
-  "version": "4.2.0",
+  "version": "4.3.0-dev",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "hg",