diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-07 18:19:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-07 18:19:30 +0000 |
| commit | 7fcb54624b31ff4b118d64ca4df36cba6d26c3eb (patch) | |
| tree | ecb43fbb17bf7ab6e8aba80f903af06ef21df90f /fixtures | |
| parent | 984dc66b0766db14d010b89fbf652fd6fe3ea8db (diff) | |
| download | gitlab-ce-7fcb54624b31ff4b118d64ca4df36cba6d26c3eb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'fixtures')
| -rw-r--r-- | fixtures/emojis/aliases.json | 4 |
1 files changed, 2 insertions, 2 deletions
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", |