• Ozzieisaacs's avatar
    Merge branch 'master' into Develop · b4d7733e
    Ozzieisaacs authored
    # Conflicts:
    #	cps/templates/list.html
    #	cps/translations/cs/LC_MESSAGES/messages.po
    #	cps/translations/de/LC_MESSAGES/messages.po
    #	cps/translations/es/LC_MESSAGES/messages.po
    #	cps/translations/fi/LC_MESSAGES/messages.po
    #	cps/translations/fr/LC_MESSAGES/messages.po
    #	cps/translations/hu/LC_MESSAGES/messages.po
    #	cps/translations/it/LC_MESSAGES/messages.po
    #	cps/translations/ja/LC_MESSAGES/messages.po
    #	cps/translations/km/LC_MESSAGES/messages.po
    #	cps/translations/nl/LC_MESSAGES/messages.po
    #	cps/translations/pl/LC_MESSAGES/messages.po
    #	cps/translations/ru/LC_MESSAGES/messages.po
    #	cps/translations/sv/LC_MESSAGES/messages.po
    #	cps/translations/uk/LC_MESSAGES/messages.po
    #	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
    #	messages.pot
    b4d7733e
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...
iso_language_names.py Loading commit data...
jinjia.py Loading commit data...
kobo.py Loading commit data...
kobo_auth.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...