Merge branch 'master' into development

# Conflicts: # cps/server.py # test/Calibre-Web TestSummary_Linux.html
2021-03-19 20:33:38 +01:00
parent b070ba142f 2760a7816d
commit d87ccae6c9
12 changed files with 230 additions and 56 deletions
--- a/cps/updater.py
+++ b/cps/updater.py
@ -330,6 +330,7 @@ class Updater(threading.Thread):

    @staticmethod
    def _load_nightly_data(repository_url, commit, status):
+        update_data = dict()
        try:
            headers = {'Accept': 'application/vnd.github.v3+json'}
            r = requests.get(repository_url + '/git/commits/' + commit['object']['sha'],