diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-19 18:34:59 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-19 18:34:59 +0100 |
commit | bbc77d31c7c928bcb986588c5941559e97ebf20c (patch) | |
tree | 7789d28c27a5fe5b058f27cfa6cff23b5254b039 /synapse/rest/client/v1/profile.py | |
parent | Merge commit '050e20e7c' into anoa/dinsic_release_1_21_x (diff) | |
parent | Add resources.consent conditional dependency back (#8107) (diff) | |
download | synapse-bbc77d31c7c928bcb986588c5941559e97ebf20c.tar.xz |
Merge commit '8b6c176ae' into anoa/dinsic_release_1_21_x
* commit '8b6c176ae': Add resources.consent conditional dependency back (#8107)
Diffstat (limited to 'synapse/rest/client/v1/profile.py')
0 files changed, 0 insertions, 0 deletions