Merge branch 'next-minor' of github.com:diaspora/diaspora into next-minor (3033e915) · Commits · Gigadoc 2 / diaspora

config/database.yml.example

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ production:
		database: diaspora_production
		test:
		<<: *combined
		database: "diaspora_test"
		database: diaspora_test
		integration1:
		<<: *combined
		database: diaspora_integration1