diff options
| author | Ben Banfield-Zanin <benbz@matrix.org> | 2020-10-15 14:48:13 +0100 |
|---|---|---|
| committer | Ben Banfield-Zanin <benbz@matrix.org> | 2020-10-15 14:48:13 +0100 |
| commit | 8d9ae573f33110e0420204bceb111fd8df649e7c (patch) | |
| tree | c8113c67df9769a14e8bb0a03620026dbe9aa0ba /contrib/jitsimeetbridge/jitsimeetbridge.py | |
| parent | Merge remote-tracking branch 'origin/anoa/3pid_check_invite_exemption' into b... (diff) | |
| parent | Remove racey assertion in MultiWriterIDGenerator (#8530) (diff) | |
| download | synapse-github/bbz/info-mainline-1.21.2.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.21.2' into bbz/info-mainline-1.21.2 github/bbz/info-mainline-1.21.2 bbz/info-mainline-1.21.2
Diffstat (limited to 'contrib/jitsimeetbridge/jitsimeetbridge.py')
| -rw-r--r-- | contrib/jitsimeetbridge/jitsimeetbridge.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/contrib/jitsimeetbridge/jitsimeetbridge.py b/contrib/jitsimeetbridge/jitsimeetbridge.py |