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
..
__init__.py	reenable startup logging	2022-04-26 14:45:06 +02:00
background_scheduler.py	Update for #2653 (AP Scheduler triggers are function calls and not strings anymore)	2023-01-15 13:49:16 +01:00
gmail.py	Update gmail.json location	2022-03-21 18:50:02 +01:00
goodreads_support.py	Code cleaning (remove python2)	2021-10-04 19:23:24 +02:00
Metadata.py	Updated test results	2022-01-30 11:15:14 +01:00
simpleldap.py	Encrypt passwords	2022-07-02 17:45:24 +02:00
SyncToken.py	Merge branch 'master' into Develop	2022-01-23 17:51:54 +01:00
worker.py	Update optional-requirements	2022-04-23 20:03:59 +02:00