diff --git a/book/changelog.md b/book/changelog.md index 031a34ae..9687498b 100644 --- a/book/changelog.md +++ b/book/changelog.md @@ -106,7 +106,8 @@ This will be the first release of Grapevine since it was forked from Conduit [!52](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/52), [!54](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/54), [!56](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/56), - [!69](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/69)) + [!69](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/69), + [!102](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/102)) 5. Stop returning unnecessary member counts from `/_matrix/client/{r0,v3}/sync`. ([!12](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/12)) 6. **BREAKING:** Allow federation by default. @@ -238,4 +239,5 @@ This will be the first release of Grapevine since it was forked from Conduit 17. Added support for configuring old verify/signing keys in config (`federation.old_verify_keys`) ([!96](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/96)) 18. Added admin commands to delete media - ([!99](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/99)) + ([!99](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/99), + [!102](https://gitlab.computer.surgery/matrix/grapevine-fork/-/merge_requests/102))