Merge with branch develop

Release version
2020-02-23 09:08:01 +01:00
parent 3a70c86f49
commit 7c89f0b5b9
14 changed files with 35 additions and 35 deletions
@@ -21,14 +21,12 @@ vendor/
 # calibre-web
 *.db
 *.log
-config.ini
-cps/static/[0-9]*

 .idea/
 *.bak
 *.log.*
-tags

 settings.yaml
 gdrive_credentials
 client_secrets.json
+