mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-29 02:08:10 +00:00
Merge branch 'master' into 2.2
# Conflicts: # gns3server/version.py
This commit is contained in:
commit
3b0bb8df4e
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user