diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-10 16:37:49 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-10 16:37:49 +0000 |
commit | dd486836f7b88cad7efee0323bb9691a054722f6 (patch) | |
tree | 0c7c3d0869dca471cf5c2f03594ef8533c24d5dc /synapse/rest/client/v1/profile.py | |
parent | Merge pull request #5465 from matrix-org/babolivier/fix_deactivation_bg_job (diff) | |
parent | Fix resetting password via a phone number (#21) (diff) | |
download | synapse-dd486836f7b88cad7efee0323bb9691a054722f6.tar.xz |
Merge remote-tracking branch 'dinsic/dinsic' into dinsic-release-v1.1.0
Diffstat (limited to 'synapse/rest/client/v1/profile.py')
-rw-r--r-- | synapse/rest/client/v1/profile.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py |