summaryrefslogtreecommitdiff
path: root/doc/README.md
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-12-20 20:07:59 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2016-12-20 20:07:59 +0100
commit3c61b13efeb52c95d13fbb75fd3016555095276b (patch)
treebc4ac0b4c818e27a4bdea376f249c0950352b6b6 /doc/README.md
parentdec1e90e505d9ab9e8b088b6a348f5bec293fed1 (diff)
parent2bc3084d68ac64fcc31276f4ec5e76f79d6fa296 (diff)
downloadgitlab-ce-3c61b13efeb52c95d13fbb75fd3016555095276b.tar.gz
Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config
Diffstat (limited to 'doc/README.md')
-rw-r--r--doc/README.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/README.md b/doc/README.md
index a60a5359540..8bf33cad5e4 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -34,6 +34,7 @@
- [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, Twitter.
- [Issue closing pattern](administration/issue_closing_pattern.md) Customize how to close an issue from commit messages.
- [Koding](administration/integration/koding.md) Set up Koding to use with GitLab.
+- [Online terminals](administration/integration/terminal.md) Provide terminal access to environments from within GitLab.
- [Libravatar](customization/libravatar.md) Use Libravatar instead of Gravatar for user avatars.
- [Log system](administration/logs.md) Log system.
- [Environment Variables](administration/environment_variables.md) to configure GitLab.