Merge branch 'master' into Develop

# Conflicts:
#	cps/opds.py
#	cps/server.py
#	cps/web.py
This commit is contained in:
Ozzie Isaacs
2023-02-05 12:10:01 +01:00
87 changed files with 5948 additions and 5978 deletions

View File

@@ -140,6 +140,7 @@ table .bg-dark-danger a { color: #fff; }
.container-fluid .book {
margin-top: 20px;
max-width: 180px;
display: flex;
flex-direction: column;
}