diff --git a/Changelog.md b/Changelog.md index 12cd5c924..2af7e8c0a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,6 +13,7 @@ ## Bug fixes * 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 diff --git a/config/database.yml.example b/config/database.yml.example index 879572d36..20f0ff43a 100644 --- a/config/database.yml.example +++ b/config/database.yml.example @@ -17,8 +17,8 @@ mysql: &mysql collation: utf8mb4_bin -# Comment the the mysql line and uncomment the postgres line -# if you want to use postgres +# Comment the postgresql line and uncomment the mysql line +# if you want to use mysql common: &common # Choose one of the following <<: *postgresql