diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-08-13 19:22:16 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-08-13 19:22:16 +0000 |
| commit | fcee676ca1ddb95aa627c2c616a11edf4cbd6c30 (patch) | |
| tree | 2ca80d4ba3a0486ef1041607d0efdb08f356be22 /doc/user/markdown.md | |
| parent | f7f31a6f910325d4456bc3a344bf359f2d59a4ee (diff) | |
| parent | f73a21e35710eef24b47307631f1996b35fdf9d3 (diff) | |
| download | gitlab-ce-fcee676ca1ddb95aa627c2c616a11edf4cbd6c30.tar.gz | |
Merge branch 'add_google_noto_color_emoji_font' into 'master'
Add Noto Color Emoji font support
See merge request gitlab-org/gitlab-ce!19036
Diffstat (limited to 'doc/user/markdown.md')
| -rw-r--r-- | doc/user/markdown.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/user/markdown.md b/doc/user/markdown.md index d7bf6838fb3..6856544ae1b 100644 --- a/doc/user/markdown.md +++ b/doc/user/markdown.md @@ -234,6 +234,8 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#emoji Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup: + Most emoji are natively supported on macOS, Windows, iOS, Android and will fallback to image-based emoji where there is lack of support. On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/help/emoji/) to get full native emoji support. + Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you: :zap: You can use emoji anywhere GFM is supported. :v: @@ -244,6 +246,8 @@ If you are new to this, don't be :fearful:. You can easily join the emoji :famil Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup: +Most emoji are natively supported on macOS, Windows, iOS, Android and will fallback to image-based emoji where there is lack of support. On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/help/emoji/) to get full native emoji support. + ### Special GitLab References GFM recognizes special references. |