From aee0a117a889461ce8ced6fcf73207fe017f1d99 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Dec 2021 13:37:47 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-6-stable-ee

---
 fixtures/emojis/aliases.json | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'fixtures')

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",
-- 
cgit v1.2.3