calibre-web/cps/translations
OzzieIsaacs 13caa54aad Merge remote-tracking branch 'Polish_translation/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
2017-02-12 08:14:44 +01:00
..
de/LC_MESSAGES Merge remote-tracking branch 'default_user_settings/master' (#105) 2017-02-10 20:18:37 +01:00
es/LC_MESSAGES Merge remote-tracking branch 'default_user_settings/master' (#105) 2017-02-10 20:18:37 +01:00
fr/LC_MESSAGES Merge remote-tracking branch 'default_user_settings/master' (#105) 2017-02-10 20:18:37 +01:00
pl/LC_MESSAGES Merge remote-tracking branch 'Polish_translation/master' 2017-02-12 08:14:44 +01:00
zh_Hans_CN/LC_MESSAGES Merge remote-tracking branch 'default_user_settings/master' (#105) 2017-02-10 20:18:37 +01:00