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

Merge branch '1.5' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle 2016-05-11 10:07:30 +02:00
commit ed0bae8689
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
gns3server/version.py merge=ours