diff options
| author | cmrd Senya <senya@riseup.net> | 2018-04-29 13:31:11 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-04-30 23:06:34 +0300 |
| commit | 8680b24a2e0de4ffc80d2f551dc5516169c87417 (patch) | |
| tree | db6ad8a881fc1cb1f77f9e5c25447209a45f4f7a /Changelog.md | |
| parent | 211e5cd1bc2900a337cc8fdf21fbe07702625bcc (diff) | |
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
Diffstat (limited to 'Changelog.md')
| -rw-r--r-- | Changelog.md | 1 |
1 files changed, 1 insertions, 0 deletions
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 |