Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-25 21:08:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-25 21:08:35 +0300
commit6fdf80d94aa10083253dad7d0eaa6204be29c843 (patch)
tree3fa886e6e15ea7577df9c1320bc52dc8065e7f21 /config/locales
parent0d8e625e4cd499162e6113dca4988b28f9faa9b6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/locales')
-rw-r--r--config/locales/en.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c95232ae540..ed0552ab452 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -272,4 +272,5 @@ en:
long: "%B %d, %Y %H:%M"
short: "%d %b %H:%M"
timeago_tooltip: "%b %-d, %Y %-l:%M%P"
+ with_timezone: "%Y-%m-%d %H:%M:%S %z"
pm: pm