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.
parallel-library/cps
Ozzieisaacs 26a7d9ef30 Merge branch 'Develop'
# Conflicts:
#	cps/__init__.py
#	cps/about.py
#	cps/admin.py
#	cps/cli.py
#	cps/config_sql.py
#	cps/constants.py
#	cps/converter.py
#	cps/db.py
#	cps/editbooks.py
#	cps/gdriveutils.py
#	cps/helper.py
#	cps/logger.py
#	cps/oauth.py
#	cps/server.py
#	cps/services/simpleldap.py
#	cps/ub.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
#	setup.cfg
#	setup.py
6 years ago
..
services Merge branch 'Develop' 6 years ago
static Merge branch 'Develop' 6 years ago
templates Fix feature support 6 years ago
translations Merge branch 'Develop' 6 years ago
__init__.py Merge branch 'Develop' 6 years ago
about.py about page: build the versions dictionary only once 6 years ago
admin.py Merge branch 'Develop' 6 years ago
cache_buster.py Merge branch 'Develop' 6 years ago
cli.py use the standard socket library to validate the ip address argument 6 years ago
comic.py Merge branch 'Develop' 6 years ago
config_sql.py Merge branch 'Develop' 6 years ago
constants.py Merge branch 'Develop' 6 years ago
converter.py about page: build the versions dictionary only once 6 years ago
db.py Merge branch 'Develop' 6 years ago
editbooks.py Merge branch 'Develop' 6 years ago
epub.py Merge branch 'Develop' 6 years ago
fb2.py Merge branch 'Develop' 6 years ago
gdrive.py Merge branch 'Develop' 6 years ago
gdriveutils.py Deactivate ldap 6 years ago
helper.py Merge branch 'Develop' 6 years ago
isoLanguages.py Merge branch 'Develop' 6 years ago
jinjia.py Merge branch 'Develop' 6 years ago
logger.py Merge branch 'Develop' 6 years ago
oauth.py Add licence to oauth 6 years ago
oauth_bb.py Merge branch 'Develop' 6 years ago
opds.py Merge branch 'Develop' 6 years ago
pagination.py Merge branch 'Develop' 6 years ago
redirect.py Merge branch 'Develop' 6 years ago
reverseproxy.py Merge branch 'Develop' 6 years ago
server.py use the standard socket library to validate the ip address argument 6 years ago
shelf.py Merge branch 'Develop' 6 years ago
subproc_wrapper.py Merge branch 'Develop' 6 years ago
ub.py more robust disposing of database session 6 years ago
updater.py Merge branch 'Develop' 6 years ago
uploader.py Merge branch 'Develop' 6 years ago
web.py Merge branch 'Develop' 6 years ago
worker.py Merge branch 'Develop' 6 years ago