Merge branch 'next-minor' of github.com:diaspora/diaspora into next-minor
This commit is contained in:
commit
3033e915e5
1 changed files with 1 additions and 1 deletions
|
|
@ -43,7 +43,7 @@ production:
|
||||||
database: diaspora_production
|
database: diaspora_production
|
||||||
test:
|
test:
|
||||||
<<: *combined
|
<<: *combined
|
||||||
database: "diaspora_test"
|
database: diaspora_test
|
||||||
integration1:
|
integration1:
|
||||||
<<: *combined
|
<<: *combined
|
||||||
database: diaspora_integration1
|
database: diaspora_integration1
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue