summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2019-03-14 10:18:18 +0100
committerJohn T Skarbek <jtslear@gmail.com>2019-03-14 09:10:45 -0400
commit17426abf3196d4a298c9f789c07034b70903c08f (patch)
treea8323bd5d286ac26ee535179672fc05c6d3f09f4 /locale
parenteb0e9e6ce8ddc40bee4421b6e4fa365942048f7d (diff)
downloadgitlab-ce-17426abf3196d4a298c9f789c07034b70903c08f.tar.gz
Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"
Reverts the loading of emojis and its images to move forward with RC
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot3
1 files changed, 0 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index fe16c268938..1928418dbd5 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2977,9 +2977,6 @@ msgstr ""
msgid "Embed"
msgstr ""
-msgid "Emojis|Something went wrong while loading emojis."
-msgstr ""
-
msgid "Empty file"
msgstr ""