8 Commits (df3eb40e3c351aaaaece84629dc0f7396e72c41b)

Author	SHA1	Message	Date
Ozzieisaacs	bbe91f439a	Merge from master	5 years ago
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	6 years ago
Ozzieisaacs	f79d549910	Fix duplicate user and email (now case insensitive #948) ... Fix sorting in comics (#950) Fix log error on Calibre converter error (#953) Fix long running tasks (#954)	6 years ago
Ozzieisaacs	cd546eb6d4	Update comic reader js	6 years ago
Ozzieisaacs	26e45f1f57	Merge remote-tracking branch 'comic-reader/master'	6 years ago
subdiox	867aa2f0bd	Beautify bitjs	6 years ago
subdiox	7982ed877c	Downgrade bitjs to es5 branch	6 years ago
subdiox	c0d136ccd8	Fix slow loading	6 years ago