Ozzieisaacs 4fecce0a0d Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py # cps/static/js/archive/unrar.js # cps/templates/readcbr.html # cps/templates/readpdf.html # cps/translations/de/LC_MESSAGES/messages.mo # cps/translations/de/LC_MESSAGES/messages.po # cps/translations/es/LC_MESSAGES/messages.mo # cps/translations/es/LC_MESSAGES/messages.po # cps/translations/fr/LC_MESSAGES/messages.mo # cps/translations/fr/LC_MESSAGES/messages.po # cps/translations/it/LC_MESSAGES/messages.mo # cps/translations/it/LC_MESSAGES/messages.po # cps/translations/ja/LC_MESSAGES/messages.mo # cps/translations/ja/LC_MESSAGES/messages.po # cps/translations/km/LC_MESSAGES/messages.mo # cps/translations/km/LC_MESSAGES/messages.po # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po # cps/translations/ru/LC_MESSAGES/messages.mo # cps/translations/ru/LC_MESSAGES/messages.po # cps/translations/sv/LC_MESSAGES/messages.mo # cps/translations/sv/LC_MESSAGES/messages.po # cps/translations/uk/LC_MESSAGES/messages.mo # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # cps/web.py # messages.pot # optional-requirements.txt		2019-05-31 11:17:47 +02:00
..
bootstrap-datepicker
bootstrap-table
tinymce
bar-ui.js
bootstrap-rating-input.min.js
bootstrap.min.js	Merge remote-tracking branch 'caliblur/master'	2019-02-20 20:00:08 +01:00
compatibility.js
compromise.min.js
context.js
context.min.js
debugger.js	Merge remote-tracking branch 'pdf.js/epubjs'	2019-04-13 15:02:01 +02:00
epub.min.js	Updated epub.js to v0.3.66	2019-03-28 07:23:45 +02:00
intention.js
intention.min.js
jquery.form.js
jquery.min.js
jquery.min.map
jquery.visible.min.js
jszip.min.js	Updated epub.js to v0.3.66	2019-03-28 07:23:45 +02:00
l10n.js
pdf.js	Merge remote-tracking branch 'pdf.js/epubjs'	2019-04-13 15:02:01 +02:00
pdf.worker.js	Merge remote-tracking branch 'pdf.js/epubjs'	2019-04-13 15:02:01 +02:00
plugins.js	Fix opds login on python3	2019-03-03 07:37:15 +01:00
reader.min.js	Updated epub.js to v0.3.66	2019-03-28 07:23:45 +02:00
readmore.min.js
screenfull.min.js	Fix an issue that fullscreen doens't work on some browsers	2019-04-21 18:02:02 +09:00
Sortable.min.js
soundmanager2.js
typeahead.bundle.js
underscore-min.js
underscore-min.map
viewer.js	Merge remote-tracking branch 'pdf.js/epubjs'	2019-04-13 15:02:01 +02:00