Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py
This commit is contained in:
grossmj committed 2018-03-14 18:40:37 +07:00
commit 88674455a3
5 files changed
+120 -84

No files matched your search

+1 -1
View File
@@ -57,7 +57,7 @@ class CrashReport:
Report crash to a third party service
"""
DSN = "sync+https://9bd029d7f92b48178b01868465532d6e:9f4a6a513bd1452fbfd1771ae2ca8b66@sentry.io/38482"
DSN = "sync+https://6b6c2ce19b8545278f7ee00c333175a6:be17229ec8da460e9a126d02b82de5dc@sentry.io/38482"
if hasattr(sys, "frozen"):
cacert = get_resource("cacert.pem")
if cacert is not None and os.path.isfile(cacert):