Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop ... # Conflicts: # cps/config_sql.py # cps/ub.py # cps/web.py		2020-04-16 20:12:27 +02:00
..
__init__.py	Fix #1307	2020-04-14 18:28:16 +02:00
goodreads_support.py	Fix #1016	2019-08-20 18:32:04 +02:00
simpleldap.py	Added fix for python2 regex	2020-04-14 10:58:32 +02:00
SyncToken.py	Fix #1164 merge.	2020-03-12 20:09:26 -04:00