diff options
author | Erik Johnston <erik@matrix.org> | 2020-05-21 15:19:00 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-05-21 15:19:00 +0100 |
commit | cf92310da26f9b6e03e98055e55c7e9767225742 (patch) | |
tree | 832140c94907ed381004d01f859abbf2fa86dd3b /changelog.d/7396.misc | |
parent | Merge branch 'rav/matrix_hacks' into matrix-org-hotfixes (diff) | |
parent | Stub out GET presence requests in the frontend proxy (#7545) (diff) | |
download | synapse-cf92310da26f9b6e03e98055e55c7e9767225742.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'changelog.d/7396.misc')
-rw-r--r-- | changelog.d/7396.misc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/7396.misc b/changelog.d/7396.misc new file mode 100644 |