diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
| commit | 4949b6837f1a2ef103f58659c7692f01378128f7 (patch) | |
| tree | 5d53313029624492c15888345167a4146d1ea918 /doc/README.md | |
| parent | 6aff5900f79721783599a7ab9fe29074e4050544 (diff) | |
| parent | f55416d9f45afcb310246426366cd261f138029f (diff) | |
| download | chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.gz chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.bz2 chat-4949b6837f1a2ef103f58659c7692f01378128f7.zip | |
Merge branch 'master' into typos
Diffstat (limited to 'doc/README.md')
| -rw-r--r-- | doc/README.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/README.md b/doc/README.md index a45b670c0..fcda4fd08 100644 --- a/doc/README.md +++ b/doc/README.md @@ -26,14 +26,16 @@ Set up Mattermost in your data center - [Developer Machine Setup](developer/Setup.md) - [Mattermost Style Guide](developer/Style-Guide.md) - [API Overview](api/Overview.md) - - [Incoming Webhooks](integrations/webhooks/Incoming.md) + - [Incoming Webhooks](integrations/webhooks/Incoming-Webhooks.md) ## Help +_Note: End user help documentation is a new feature being completed for the v1.2 release. The materials below are work in progress._ + - User Interface - [Manage Team](help/Manage-Team.md) - Team Settings - - [Slack Import](usage/Slack-Import.md) + - [Slack Import](help/Slack-Import.md) - Messaging - [Mattermost Markdown Formatting](usage/Markdown.md) |