NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4708347c16
calibre-web/cps
History
Ozzieisaacs 4708347c16 Merge branch 'Develop' 
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
2019-07-13 20:54:21 +02:00
..
services Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
static Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
templates Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
translations Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
__init__.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
about.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
admin.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
cache_buster.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
cli.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
comic.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
config_sql.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
constants.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
converter.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
db.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
editbooks.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
epub.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
fb2.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
gdrive.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
gdriveutils.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
helper.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
isoLanguages.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
jinjia.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
logger.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
oauth_bb.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
oauth.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
opds.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
pagination.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
redirect.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
reverseproxy.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
server.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
shelf.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
subproc_wrapper.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
ub.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
updater.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
uploader.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
web.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
worker.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00