Commit 2fba3189 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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

......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment