1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-09 19:40:00 +00:00
calibre-web/cps/static/css
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
..
fonts Redownloaded glyphicon font files #515 2018-05-31 09:33:43 +02:00
images Merge branch 'master' into Develop 2019-04-13 16:42:09 +02:00
libs Merge branch 'master' into Develop 2019-04-13 16:42:09 +02:00
caliBlur.min.css Update version 2019-05-30 10:21:11 +02:00
kthoom.css Add reading direction settings to readcbr page 2019-04-21 18:20:15 +09:00
listen.css Merge remote-tracking branch 'audiobook/Branch_c27805b' 2019-01-27 11:14:38 +01:00
main.css Epub Viewer Bugfix Retenia Ipad devices 2017-07-09 16:28:22 +02:00
popup.css Update epub reader and pdf reader 2016-07-09 16:54:13 +08:00
style.css Merge branch 'master' into Develop 2019-03-10 08:31:10 +01:00
upload.css fixing issue #833 2019-03-08 20:44:45 -05:00