Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

2017-07-19 10:52:08 +02:00 · 2017-07-19 10:52:08 +02:00 · efad1f9fb1
commit efad1f9fb1
parent 04c97d1201 337d8f96d6
1 changed files with 1 additions and 1 deletions
--- a/db/seeds/settings.rb
+++ b/db/seeds/settings.rb
@ -1225,7 +1225,7 @@ Setting.create_if_not_exists(
        null: true,
        name: 'site',
        tag: 'input',
-        placeholder: 'https://gitlab.YOURDOMAIN.com',
+        placeholder: 'https://oauth.YOURDOMAIN.com',
      },
      {
        display: 'authorize_url',