Merge branch 'master' into 2.2

# Conflicts: # gns3/version.py
GNS3 · Sep 24, 2019 · 20a09b5 · 20a09b5
2 parents 8d1bff7 + 1938cda
commit 20a09b5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gns3/version.py b/gns3/version.py
@@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.0rc5"
-__version_info__ = (2, 2, 0, -99)
+__version__ = "2.2.0dev18"
+__version_info__ = (2, 2, 0, 99)
 
 # If it's a git checkout try to add the commit
 if "dev" in __version__: