diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-14 16:59:24 -0700 |
| commit | 3bd350dcaf65a89040f7ea395a19b620819ba03e (patch) | |
| tree | 72b49e6fadfc1d513489b8938d5f73620ff2a6d8 /doc/README.md | |
| parent | e06e292be71ca699d90bafbd635118aa47c2d7a5 (diff) | |
| parent | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (diff) | |
| download | chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.gz chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.tar.bz2 chat-3bd350dcaf65a89040f7ea395a19b620819ba03e.zip | |
Merge branch 'master' into PLT-12-log
Diffstat (limited to 'doc/README.md')
| -rw-r--r-- | doc/README.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/README.md b/doc/README.md index 36d16b744..491c75b9b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -16,9 +16,10 @@ ### Configuration - [GitLab SSO Configuration](integrations/sso/gitlab-sso.md) -- [SMTP Email Setup](smtp-email-setup.md) +- [SMTP Email Setup](config/smtp-email-setup.md) ## Developer Documentation -- [Developer Machine Setup](doc/install/dev-setup.md) +- [Code Contribution Guidelines](developer/code-contribution.md) +- [Developer Machine Setup](install/dev-setup.md) - [Mattermost Style Guide](developer/style-guide.md) |