1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-25 17:40:31 +00:00
calibre-web/cps/static
Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
2020-04-25 20:06:25 +02:00
..
css Merge remote-tracking branch 'origin/master' 2020-04-05 19:10:27 +02:00
img - Completly new setup of GDrive (every data is taken from client_secret.json file) 2018-06-02 10:59:34 +02:00
js Merge branch 'master' into Develop 2020-04-25 20:06:25 +02:00
locale Updated pdf viewer to 2.2.228 (#1184) 2020-02-09 17:02:47 +01:00
favicon.ico Favicon replaced (#424) with hiher resolution 2018-01-06 11:36:23 +01:00
generic_cover.jpg check if wand is available, add dummy cover.jpg otherwise 2016-04-08 22:57:58 +02:00