1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-01-26 05:27:24 +02:00
OzzieIsaacs 299cf82921 Merge remote-tracking branch 'translation/master'
# Conflicts:
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
2017-09-22 20:56:36 +02:00
..