summary refs log tree commit diff
path: root/synapse/rest/client/v1/profile.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:34:59 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2020-10-19 18:34:59 +0100
commitbbc77d31c7c928bcb986588c5941559e97ebf20c (patch)
tree7789d28c27a5fe5b058f27cfa6cff23b5254b039 /synapse/rest/client/v1/profile.py
parentMerge commit '050e20e7c' into anoa/dinsic_release_1_21_x (diff)
parentAdd resources.consent conditional dependency back (#8107) (diff)
downloadsynapse-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