Merge branch 'master' into Develop

# Conflicts: # cps/opds.py # cps/server.py # cps/web.py
2023-02-05 12:10:01 +01:00
parent 3a262661b5 275675b48a
commit 4b7a0f3662
87 changed files with 5948 additions and 5978 deletions
@@ -28,6 +28,7 @@ cps/cache
 .idea/
 *.bak
 *.log.*
+.key

 settings.yaml
 gdrive_credentials