diff options
| author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
|---|---|---|
| committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
| commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
| tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /doc/README.md | |
| parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
| parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
| download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip | |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'doc/README.md')
| -rw-r--r-- | doc/README.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/README.md b/doc/README.md index 7ee2bb46c..ccb702a5d 100644 --- a/doc/README.md +++ b/doc/README.md @@ -8,15 +8,17 @@ Get up and running quickly with Docker-based install - [AWS Elastic Beanstalk Setup](install/Amazon-Elastic-Beanstalk.md) - [Docker Single Container Preview Setup](install/Docker-Single-Container.md) - [SMTP Email Setup](install/SMTP-Email-Setup.md) +- [System Console Settings](install/Configuration-Settings.md) #### Production Installation Set up Mattermost in your data center - [Software and Hardware Requirements](install/Requirements.md) - [Production Ubuntu Setup](install/Production-Ubuntu.md) - [SMTP Email Setup](install/SMTP-Email-Setup.md) +- [System Console Settings](install/Configuration-Settings.md) #### Configuration and Management -- Configuration Settings Overview +- [System Console Settings](install/Configuration-Settings.md) - [GitLab SSO Configuration](integrations/Single-Sign-On/Gitlab.md) - [Mattermost Release Numbering Scheme](install/Release-Numbering.md) |