Merge branch 'master' of github.com:gitlabhq/gitlabhq

2fba3189 · Dmitriy Zaporozhets · a5f58493 · a3ef61de · 2fba3189
Commit 2fba3189 authored Jan 18, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/gitlab.yml.example config/gitlab.yml.example +1 -1

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -44,7 +44,7 @@ production: &base
    # Email address used in the "From" field in mails sent by GitLab
    email_from: example@example.com

-    # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
+    # Email server smtp settings are in config/initializers/smtp_settings.rb.sample

    ## User settings
    default_projects_limit: 10