Merge branch 'master' into Develop

# Conflicts: # cps/book_formats.py # cps/helper.py # cps/web.py
2019-04-20 18:32:46 +02:00
parent 05da2ae3c7 f1a65a2aeb
commit 2de4bfdcf2
13 changed files with 266 additions and 107 deletions
@@ -243,7 +243,7 @@ class Updater(threading.Thread):

    @classmethod
    def _stable_version_info(self):
-        return {'version': '0.6.1'} # Current version
+        return {'version': '0.6.2'} # Current version

    def _nightly_available_updates(self, request_method):
        tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)