diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /fixtures | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
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", |