Merge branch 'master' into 2.2

# Conflicts: # gns3server/version.py
5 years ago · 3b0bb8df4e
parent 4656521987 9559748f9d
commit 3b0bb8df4e
1 changed files with 2 additions and 2 deletions
--- a/gns3server/version.py
+++ b/gns3server/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.0rc3"
-__version_info__ = (2, 2, 0, -99) # If it's a git checkout try to add the commit
+__version__ = "2.2.0dev16"
+__version_info__ = (2, 2, 0, 99)

 if "dev" in __version__:
    try: