Merge branch 'patch-28' into 'master'

emoji.codes is now emojicopy.com See merge request gitlab-org/gitlab-ce!17212

Merge branch 'patch-28' into 'master'
emoji.codes is now emojicopy.com See merge request gitlab-org/gitlab-ce!17212
b5372d82 · Rémy Coutable · 062f487c · 835e0227 · b5372d82
Commit b5372d82 authored Feb 21, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

doc/user/markdown.md doc/user/markdown.md +2 -2

No files found.
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -226,7 +226,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#emoji
 	If you are new to this, don't be :fearful:. You can easily join the emoji :family:. All you need to do is to look up on the supported codes.
-	Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported emoji codes. :thumbsup:
+	Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup:
 Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you:
@@ -236,7 +236,7 @@ You can use it to point out a :bug: or warn about :speak_no_evil: patches. And i
 If you are new to this, don't be :fearful:. You can easily join the emoji :family:. All you need to do is to look up on the supported codes.
-Consult the [Emoji Cheat Sheet](http://emoji.codes) for a list of all supported emoji codes. :thumbsup:
+Consult the [Emoji Cheat Sheet](https://www.emojicopy.com) for a list of all supported emoji codes. :thumbsup:
 ### Special GitLab References