diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-02-09 01:19:57 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-02-09 01:19:57 +0300 |
| commit | 3033e915e56edc7385d0fa664a72c1233cca0976 (patch) | |
| tree | 3e559e87a55009196465919fed642a9972754b60 | |
| parent | a8fcbb3365de007eb75e38d88c0dd94309c6b68e (diff) | |
| parent | 35535d5bfb1c527d1986c31784ab6bc4a49fcf35 (diff) | |
Merge branch 'next-minor' of github.com:diaspora/diaspora into next-minor
| -rw-r--r-- | config/database.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/database.yml.example b/config/database.yml.example index 20f0ff43a..8424342b6 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -43,7 +43,7 @@ production: database: diaspora_production test: <<: *combined - database: "diaspora_test" + database: diaspora_test integration1: <<: *combined database: diaspora_integration1 |