summaryrefslogtreecommitdiffstats
path: root/doc/help
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-20 07:36:23 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-20 07:36:23 -0500
commit00ef630412a1d767804482a5b456bb43256daf43 (patch)
tree6bcfda13a90ba592dd1ee29c6f8c28f1407e33d8 /doc/help
parent53d96f026b7155af0bb30e1bc74e449dac01f440 (diff)
parentda6465e15095462c6a9553fecd663a7a4f7b2941 (diff)
downloadchat-00ef630412a1d767804482a5b456bb43256daf43.tar.gz
chat-00ef630412a1d767804482a5b456bb43256daf43.tar.bz2
chat-00ef630412a1d767804482a5b456bb43256daf43.zip
Merge pull request #1474 from esethna/patch-19
Update Message.md
Diffstat (limited to 'doc/help')
-rw-r--r--doc/help/Messaging.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/help/Messaging.md b/doc/help/Messaging.md
index 09d35f3b9..cc26a948e 100644
--- a/doc/help/Messaging.md
+++ b/doc/help/Messaging.md
@@ -16,6 +16,9 @@ Mattermost messages are formatted using a standard called "markdown". Here are e
| `_italic_`|_italic_|
|`[hyperlink](http://mattermost.org)`|[hyperlink](http://mattermost.org)|
|`![embedded image](https://travis-ci.org/mattermost/platform.svg)`|![embedded image](https://travis-ci.org/mattermost/platform.svg)|
+|`:smile:` `:sheep:` `:alien:`|:smile: :sheep: :alien:|
+
+Check out a full list of Emojis [here](http://www.emoji-cheat-sheet.com/).
## Mentioning Teammates