• Ozzieisaacs's avatar
    Merge branch 'Develop' · 26a7d9ef
    Ozzieisaacs authored
    # 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
    26a7d9ef
Name
Last commit
Last update
..
services Loading commit data...
static Loading commit data...
templates Loading commit data...
translations Loading commit data...
__init__.py Loading commit data...
about.py Loading commit data...
admin.py Loading commit data...
cache_buster.py Loading commit data...
cli.py Loading commit data...
comic.py Loading commit data...
config_sql.py Loading commit data...
constants.py Loading commit data...
converter.py Loading commit data...
db.py Loading commit data...
editbooks.py Loading commit data...
epub.py Loading commit data...
fb2.py Loading commit data...
gdrive.py Loading commit data...
gdriveutils.py Loading commit data...
helper.py Loading commit data...
isoLanguages.py Loading commit data...
jinjia.py Loading commit data...
logger.py Loading commit data...
oauth.py Loading commit data...
oauth_bb.py Loading commit data...
opds.py Loading commit data...
pagination.py Loading commit data...
redirect.py Loading commit data...
reverseproxy.py Loading commit data...
server.py Loading commit data...
shelf.py Loading commit data...
subproc_wrapper.py Loading commit data...
ub.py Loading commit data...
updater.py Loading commit data...
uploader.py Loading commit data...
web.py Loading commit data...
worker.py Loading commit data...