From 5cad9b3c6ca0442241375f03aa3a28191a7eef36 Mon Sep 17 00:00:00 2001 From: goobertron Date: Wed, 11 Feb 2015 19:59:18 +0000 Subject: [PATCH] Ahem! --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index bf0cfe973..dde824983 100644 --- a/Changelog.md +++ b/Changelog.md @@ -33,7 +33,7 @@ series and run our comprehensive test suite against it. The default for including jQuery from a CDN has changed. If you want to continue to include it from a CDN, please explicitly set the `jquery_cdn` setting to `true` in diaspora.yml. ## Change in database.yml -For MySQL databases, replace `charset: utf8` with `encoding: utf8mb4m` and change `collation` from `utf8_bin` to `utf8mb4_bin` in the file `config/database.yml`. +For MySQL databases, replace `charset: utf8` with `encoding: utf8mb4` and change `collation` from `utf8_bin` to `utf8mb4_bin` in the file `config/database.yml`. This is enables full UTF8 support (4bytes characters), including standard emoji characters. See `database.yml.example` for reference. Please make sure to stop Diaspora prior running this migration!