Merge branch 'master' into registry-359

This commit is contained in:
Artur Beljajev 2017-02-28 06:08:11 +02:00
commit 2b101776e5

View file

@ -18,7 +18,7 @@ en:
time:
formats:
default: "%d. %B %Y, %H:%M"
default: "%Y-%m-%d %H:%M"
longer: "%a, %e. %b %Y, %H:%M"
long: "%A, %e. %B %Y, %H:%M"
short: "%d.%m.%y, %H:%M"
@ -28,6 +28,7 @@ en:
ydate: "%Y.%m.%d"
date:
formats:
default: "%Y-%m-%d"
year_and_month: "%Y %B"
activerecord: