Merge branch 'master' into Develop

# Conflicts:
#	cps/helper.py
#	cps/reverseproxy.py
This commit is contained in:
Ozzieisaacs
2019-04-21 08:50:31 +02:00
2 changed files with 5 additions and 7 deletions
+1 -1
View File
@@ -243,7 +243,7 @@ class Updater(threading.Thread):
@classmethod
def _stable_version_info(self):
return {'version': '0.6.2'} # Current version
return {'version': '0.6.3 Beta'} # Current version
def _nightly_available_updates(self, request_method):
tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)