You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		4 years ago
..
css	Merge remote-tracking branch 'origin/master'	4 years ago
img	- Completly new setup of GDrive (every data is taken from client_secret.json file)	6 years ago
js	Merge branch 'master' into Develop	4 years ago
locale	Updated pdf viewer to 2.2.228 (#1184)	4 years ago
favicon.ico	Favicon replaced (#424) with hiher resolution	7 years ago
generic_cover.jpg	check if wand is available, add dummy cover.jpg otherwise	8 years ago