Merge branch 'master' into 'master'

Master

See merge request agenda-libre/agenda-libre-ruby!34
This commit is contained in:
echarp 2019-05-10 10:24:04 +02:00
commit 71a4972601
2 changed files with 4 additions and 4 deletions

View File

@ -7,6 +7,6 @@ de:
long: '%A %e %B %Y'
time:
formats:
at: '%A %e %B %Y um %Hh%M'
hours: '%Hh%M'
at: '%A %e %B %Y um %H:%M Uhr'
hours: '%H:%M Uhr'
xml: '%Y/%m/%d %T'

View File

@ -7,6 +7,6 @@ nl:
long: '%A %e %B %Y'
time:
formats:
at: '%A %e %B %Y om %Hh%M'
hours: '%Hh%M'
at: '%A %e %B %Y om %Hu%M'
hours: '%Hu%M'
xml: '%Y/%m/%d %T'