You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop ... # Conflicts: # cps/config_sql.py # cps/ub.py # cps/web.py		4 years ago
..
SyncToken.py	Fix #1164 merge.	4 years ago
__init__.py	Fix #1307	4 years ago
goodreads_support.py	Fix #1016	5 years ago
simpleldap.py	Added fix for python2 regex	4 years ago