1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-02-03 13:21:21 +02:00
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
..
2023-01-21 15:23:18 +01:00
2023-01-28 18:52:50 +01:00
2022-09-23 20:45:30 +02:00
2023-01-21 15:23:18 +01:00