Unverified Commit 3033e915 authored by Benjamin Neff's avatar Benjamin Neff

Merge branch 'next-minor' of github.com:diaspora/diaspora into next-minor

parents a8fcbb33 35535d5b
......@@ -43,7 +43,7 @@ production:
database: diaspora_production
<<: *combined
database: "diaspora_test"
database: diaspora_test
<<: *combined
database: diaspora_integration1
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