diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-07-17 15:06:41 +0200 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2019-07-17 15:06:41 +0200 |
commit | 28803ad56afed205a58f7f8ae1ce9e5d1eab10f5 (patch) | |
tree | 876cae312ee14843b8db08d1844924a86e088da6 /synapse | |
parent | Changelog (diff) | |
parent | Merge pull request #5646 from matrix-org/babolivier/profile-allow-self (diff) | |
download | synapse-28803ad56afed205a58f7f8ae1ce9e5d1eab10f5.tar.xz |
Merge branch 'dinsic' into babolivier/3pid-invite
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/handlers/profile.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py |