diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-26 14:15:30 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-26 14:15:30 +0000 |
commit | 9fb350af65e22b917ce5fe9b1a2f21cc9e8d833e (patch) | |
tree | e5204acaabdbcd361c70a2422d08672b003372d0 /pyproject.toml | |
parent | Prevent account_data content from being sent over TCP replication (#6333) (diff) | |
parent | 1.6.0 (diff) | |
download | synapse-9fb350af65e22b917ce5fe9b1a2f21cc9e8d833e.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'pyproject.toml')
0 files changed, 0 insertions, 0 deletions