nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2017-01-16 01:17:35 +01:00
commit a0bfe6ffbe
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -13,6 +13,7 @@
## Bug fixes ## Bug fixes
* Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281) * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281)
* Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282)
## Features ## Features

4
config/database.yml.example
View file

@ -17,8 +17,8 @@ mysql: &mysql
collation: utf8mb4_bin collation: utf8mb4_bin
# Comment the the mysql line and uncomment the postgres line # Comment the postgresql line and uncomment the mysql line
# if you want to use postgres # if you want to use mysql
common: &common common: &common
# Choose one of the following # Choose one of the following
<<: *postgresql <<: *postgresql