summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-11-15 18:08:25 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-11-15 18:08:25 +0000
commit0f5faea404ab514917adf06768f1a0991482b5b5 (patch)
tree6d90e4791404fda0cf1b44732eed45d0f00b6bdc /changelogs
parent69953fae36560773a06bbc426747e3dac6aa1ae1 (diff)
parentce1a1aa1f67d0438fd534920c9aef4e068ea4ddd (diff)
downloadgitlab-ce-0f5faea404ab514917adf06768f1a0991482b5b5.tar.gz
Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'
Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/update-emoji-digests-with-latest-from-gemojione.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/update-emoji-digests-with-latest-from-gemojione.yml b/changelogs/unreleased/update-emoji-digests-with-latest-from-gemojione.yml
new file mode 100644
index 00000000000..e509a8df6bc
--- /dev/null
+++ b/changelogs/unreleased/update-emoji-digests-with-latest-from-gemojione.yml
@@ -0,0 +1,6 @@
+---
+title: 'Update emojis. Add :gay_pride_flag: and :speech_left:. Remove extraneous comma
+ in :cartwheel_tone4:'
+merge_request:
+author:
+type: changed