diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-19 03:09:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-19 03:09:40 +0300 |
commit | 0aa559415ca12dd0f0efd226873dd2a8e5313e3d (patch) | |
tree | 41313e784a73a2f1f173cbaeee4eb106435ed35e /fixtures | |
parent | 5d3b84924481aa7d7c67f712c547edcd8f04fe52 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'fixtures')
-rw-r--r-- | fixtures/emojis/aliases.json | 2 |
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", |