Commit Graph

3 Commits

Author SHA1 Message Date
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
Cervinko Cera 704198655b custom columns unfinished 2016-04-20 19:25:47 +02:00
Jan Broer 64a9cbce2d Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/ 2015-08-02 20:59:11 +02:00