Merge branch 'master' into 2.2

# Conflicts:
#	gns3server/version.py
This commit is contained in:
grossmj 2019-08-20 17:34:47 +07:00
commit 3b0bb8df4e

View File

@ -23,8 +23,8 @@
# or negative for a release candidate or beta (after the base version # or negative for a release candidate or beta (after the base version
# number has been incremented) # number has been incremented)
__version__ = "2.2.0rc3" __version__ = "2.2.0dev16"
__version_info__ = (2, 2, 0, -99) # If it's a git checkout try to add the commit __version_info__ = (2, 2, 0, 99)
if "dev" in __version__: if "dev" in __version__:
try: try: