From 41fe97390ceddf945f3d967b8fdb3de4c66b7dea Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 18 Mar 2022 20:02:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-9-stable-ee --- fixtures/emojis/aliases.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fixtures') diff --git a/fixtures/emojis/aliases.json b/fixtures/emojis/aliases.json index c054e5e9f43..3d2894c1e00 100644 --- a/fixtures/emojis/aliases.json +++ b/fixtures/emojis/aliases.json @@ -1,6 +1,4 @@ { - ":) ":"smile", - ":( ":"disappointed", "small_airplane":"airplane_small", "right_anger_bubble":"anger_right", "keycap_asterisk":"asterisk", @@ -54,6 +52,7 @@ "passenger_ship":"cruise_ship", "dagger_knife":"dagger", "desktop_computer":"desktop", + ":( ":"disappointed", "card_index_dividers":"dividers", "dove_of_peace":"dove", "drool":"drooling_face", @@ -488,6 +487,7 @@ "skull_and_crossbones":"skull_crossbones", "slightly_frowning_face":"slight_frown", "slightly_smiling_face":"slight_smile", + ":) ":"smile", "sneeze":"sneezing_face", "speaking_head_in_silhouette":"speaking_head", "left_speech_bubble":"speech_left", -- cgit v1.2.1