summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-09-20 09:41:14 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2015-09-20 09:41:14 +0200
commitd622df0bf8dea5167f53b3b5595832e7a77b93e6 (patch)
tree6031fd7b363a72437c073a7c2995374d07b52cbc
parent96790b1aac63b57321e5e61652e5a69497b64427 (diff)
parenta26680acdfb501a27a9b5116479e146b4eae2a21 (diff)
downloadgitlab-ce-d622df0bf8dea5167f53b3b5595832e7a77b93e6.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--config/gitlab.yml.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index eada70faebc..69cdf497a84 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -96,7 +96,7 @@ production: &base
## Reply by email
# Allow users to comment on issues and merge requests by replying to notification emails.
- # For documentation on how to set this up, see http://doc.gitlab.com/ce/reply_by_email/README.md
+ # For documentation on how to set this up, see http://doc.gitlab.com/ce/reply_by_email/README.html
reply_by_email:
enabled: false
address: "replies+%{reply_key}@gitlab.example.com"