mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Merge remote-tracking branch 'origin/2.1' into 2.1
This commit is contained in:
commit
60bc386d6b
3 files changed
+8
-2
No files matched your search
@@ -57,7 +57,7 @@ class CrashReport:
|
||||
Report crash to a third party service
|
||||
"""
|
||||
|
||||
DSN = "sync+https://813fc16ef4624d1da49210217a19c8aa:732b290d64214e9c99a75336bf96d3fe@sentry.io/38482"
|
||||
DSN = "sync+https://2d27a0554eb940d5b7729acb4cf1bb99:874ec597a2c044319fcb4183b11af0f9@sentry.io/38482"
|
||||
if hasattr(sys, "frozen"):
|
||||
cacert = get_resource("cacert.pem")
|
||||
if cacert is not None and os.path.isfile(cacert):
|
||||
|
||||
@@ -23,8 +23,9 @@
|
||||
# or negative for a release candidate or beta (after the base version
|
||||
# number has been incremented)
|
||||
|
||||
__version__ = "2.1.0dev5"
|
||||
__version__ = "2.1.0dev6"
|
||||
__version_info__ = (2, 1, 0, -99)
|
||||
|
||||
# If it's a git checkout try to add the commit
|
||||
if "dev" in __version__:
|
||||
try:
|
||||
|
||||
Reference in new issue
Block a user