Merge branch 'master' into develop

do-mpc · Dec 5, 2021 · a46c9c2 · a46c9c2
2 parents 38325fb + 452e097
commit a46c9c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/documentation/source/conf.py b/documentation/source/conf.py
@@ -26,7 +26,8 @@
 author = 'Sergio Lucia and Felix Fiedler'
 
 # The full version, including alpha/beta/rc tags
-release = '4.2.1'
+release = '4.3.0'
+
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='do_mpc',
-    version='4.2.0',
+    version='4.2.5',
     packages=['do_mpc','do_mpc.tools'],
     author='Sergio Lucia and Felix Fiedler',
     author_email='sergio.lucia@tu-berlin.de',