ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-21 00:22:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 3.0

Browse Source 
# Conflicts:
#	gns3server/version.py
This commit is contained in:
grossmj
2021-05-15 20:12:21 +09:30
parent 8810249d36 2c938b2c19
commit e86d8f96ca
14 changed files with 159 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/version.py
View File

@ -29,7 +29,6 @@ if "dev" in __version__:
try:
import os
import subprocess
if os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", ".git")):
r = subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).decode().strip()
__version__ = f"{__version__}-{r}"