diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-08-18 12:21:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-18 12:21:30 +0100 |
commit | cdc67dfdc036c7652446cf151f1bfaab7f92b255 (patch) | |
tree | c576ebd50c0080f6dd7ca8d12aff4070d72a9868 | |
parent | Merge pull request #53 from matrix-org/anoa/dinsic_release_1_18_x (diff) | |
parent | Update changelog.d/56.misc (diff) | |
download | synapse-cdc67dfdc036c7652446cf151f1bfaab7f92b255.tar.xz |
Merge pull request #56 from matrix-org/babolivier/dinsic_presence_user_id
Revert "Remove "user_id" from GET /presence. (#7606)"
-rw-r--r-- | changelog.d/56.misc | 1 | ||||
-rw-r--r-- | synapse/rest/client/v1/presence.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/changelog.d/56.misc b/changelog.d/56.misc new file mode 100644 |