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

Merge branch 'master' into unstable

Browse Source
This commit is contained in:
Julien Duponchelle 2015-06-23 09:47:01 +02:00
commit 82e2a16b27
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,5 +1,9 @@
# Change Log # Change Log
## 1.3.7 22/06/2015
* Prevent install on Python 2
## 1.3.6 16/06/2015 ## 1.3.6 16/06/2015
* Fix an issue with 1.4dev compatibility * Fix an issue with 1.4dev compatibility

2
gns3server/crash_report.py
View File

@ -52,7 +52,7 @@ class CrashReport:
Report crash to a third party service Report crash to a third party service
""" """
DSN = "sync+https://3d569add80c74d4faecf90836bcdc1b5:3b5aa0c47c1847bc8d019b5e52ebdd1a@app.getsentry.com/38482" DSN = "sync+https://c06a407cbe0d4036be7873b54ebfa0ef:d6129d3fe91a4ea0b96ecbcf99678b1b@app.getsentry.com/38482"
if hasattr(sys, "frozen"): if hasattr(sys, "frozen"):
cacert = get_resource("cacert.pem") cacert = get_resource("cacert.pem")
if cacert is not None and os.path.isfile(cacert): if cacert is not None and os.path.isfile(cacert):