arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 1.5

Browse Source
This commit is contained in:
Julien Duponchelle 2016-02-24 15:52:27 +01:00
commit 49f1931e95
No known key found for this signature in database
GPG Key ID: F1E2485547D4595D
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tox.ini
View File

@ -14,4 +14,4 @@ exclude = tests/*
[pytest]
norecursedirs = .tox
timeout = 5
timeout = 15