Ozzie Isaacs
508e2b4d0a
Merge branch 'master' into Develop
# Conflicts:
# cps/admin.py
# cps/config_sql.py
# cps/search.py
# cps/templates/admin.html
# cps/web.py
# setup.cfg
# test/Calibre-Web TestSummary_Linux.html
2023-01-28 18:52:50 +01:00
..
2018-05-31 09:33:43 +02:00
2019-07-13 20:54:21 +02:00
2021-02-20 20:03:39 +01:00
2022-09-05 19:42:02 +02:00
2022-10-21 15:08:33 +02:00
2022-12-25 11:04:14 +01:00
2022-03-06 15:56:54 +05:30
2021-04-25 19:59:53 +00:00
2021-03-14 16:57:33 +01:00
2022-03-06 15:56:54 +05:30
2020-04-27 20:01:13 +02:00
2022-12-25 10:29:29 +01:00
2022-06-16 08:33:39 +02:00
2021-10-03 09:31:24 +02:00
2020-04-27 20:01:13 +02:00