Merge branch 'release/2.6.0'

bivab · bivab · commit bec991da07f7 · 2017-05-10T18:51:59.000+02:00
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.0
+current_version = 2.6.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>\w+))?
 commit = True
 tag = False
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
-MODEL_GENERATOR_VERSION=4.7.0
+MODEL_GENERATOR_VERSION=4.8.0
 modelgenerator=bin/modelgenerator-$(MODEL_GENERATOR_VERSION).jar
 
-MINCER_VERSION=2.3.0
+MINCER_VERSION=2.4.0
 mincer=bin/mincer-$(MINCER_VERSION).jar
 
 # Available flavors for data
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0
