From 8680b24a2e0de4ffc80d2f551dc5516169c87417 Mon Sep 17 00:00:00 2001 From: cmrd Senya Date: Sun, 29 Apr 2018 13:31:11 +0300 Subject: Account merging support Adds support for merging accounts with account migration by eliminating duplicate data in favor of the target user's data. closes #7803 --- Changelog.md | 1 + 1 file changed, 1 insertion(+) (limited to 'Changelog.md') diff --git a/Changelog.md b/Changelog.md index 7a7e25366..45862c627 100644 --- a/Changelog.md +++ b/Changelog.md @@ -15,6 +15,7 @@ ## Features * Make public stream accessible for logged out users [#7775](https://github.com/diaspora/diaspora/pull/7775) +* Add account-merging support when receiving an account migration [#7803](https://github.com/diaspora/diaspora/pull/7803) # 0.7.4.1 -- cgit v1.2.3