summary refs log tree commit diff
path: root/pyproject.toml
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-28 12:08:02 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-28 12:08:02 +0000
commit96562131a49d5a0b0e7e68f94f0884d23daaf8f3 (patch)
tree60704e66b8496e537ff833cd30002178673e4b00 /pyproject.toml
parentRemove local threepids on account deactivation (#6426) (diff)
parent1.6.1 (diff)
downloadsynapse-96562131a49d5a0b0e7e68f94f0884d23daaf8f3.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'pyproject.toml')
0 files changed, 0 insertions, 0 deletions