diff options
author | Erik Johnston <erik@matrix.org> | 2021-05-06 14:36:59 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-05-06 14:36:59 +0100 |
commit | a8803e2b6e2dfb5bb6f180f1b3e9cd3f04036a40 (patch) | |
tree | f6606188f50cf4dace37ee5f3845443cbcff492e /setup.py | |
parent | Follow-up to #9915 to correct the identifier for room types. (diff) | |
parent | 1.33.1 (diff) | |
download | synapse-a8803e2b6e2dfb5bb6f180f1b3e9cd3f04036a40.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions