diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-10-21 16:42:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-21 16:42:09 +0100 |
commit | 4d5ed3daf41a9f5e644f73d4dfd0a1f23c6a0a80 (patch) | |
tree | b3457beef004549eb8d986dc8c84914ab025c258 /synapse/rest/client/v2_alpha/tokenrefresh.py | |
parent | Remember mappings when we bind a 3pid using the internal sydent bind API (#66) (diff) | |
parent | Changelog (diff) | |
download | synapse-4d5ed3daf41a9f5e644f73d4dfd0a1f23c6a0a80.tar.xz |
Merge pull request #67 from matrix-org/anoa/dinsic_release_1_21_x
Merge Synapse release v1.21.2 into 'dinsic'
Diffstat (limited to 'synapse/rest/client/v2_alpha/tokenrefresh.py')
-rw-r--r-- | synapse/rest/client/v2_alpha/tokenrefresh.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/tokenrefresh.py b/synapse/rest/client/v2_alpha/tokenrefresh.py |