summaryrefslogtreecommitdiff
path: root/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-19 00:09:40 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-19 00:09:40 +0000
commit0aa559415ca12dd0f0efd226873dd2a8e5313e3d (patch)
tree41313e784a73a2f1f173cbaeee4eb106435ed35e /fixtures
parent5d3b84924481aa7d7c67f712c547edcd8f04fe52 (diff)
downloadgitlab-ce-0aa559415ca12dd0f0efd226873dd2a8e5313e3d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'fixtures')
-rw-r--r--fixtures/emojis/aliases.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/fixtures/emojis/aliases.json b/fixtures/emojis/aliases.json
index f549d20cd73..c054e5e9f43 100644
--- a/fixtures/emojis/aliases.json
+++ b/fixtures/emojis/aliases.json
@@ -1,4 +1,6 @@
{
+ ":) ":"smile",
+ ":( ":"disappointed",
"small_airplane":"airplane_small",
"right_anger_bubble":"anger_right",
"keycap_asterisk":"asterisk",