Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-05-11 10:07:30 +02:00
commit ed0bae8689
1 file changed
+2
+2
View File
@@ -0,0 +1,2 @@
gns3server/version.py merge=ours