Merge remote-tracking branch 'origin/master' into 2.3

This commit is contained in:
Jeremy Benoist
2017-05-19 11:25:19 +02:00
23 changed files with 727 additions and 604 deletions

View File

@ -215,7 +215,7 @@ entry:
# share_email_label: 'Email'
# public_link: 'public link'
# delete_public_link: 'delete public link'
download: 'Download'
# export: 'Export'
# print: 'Print'
problem:
label: 'Problemer?'