diff options
| author | Erik Johnston <erik@matrix.org> | 2017-11-07 13:31:03 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-11-07 13:31:03 +0000 |
| commit | f9b255cd62fe724e16b2222f6af623b2d39282ab (patch) | |
| tree | b22288443c2edfa647f6a0ac5980066014b20a1f /synapse/__init__.py | |
| parent | Merge pull request #2647 from matrix-org/luke/get-group-users-is-privileged (diff) | |
| parent | Merge pull request #2598 from matrix-org/revert-2596-erikj/attestation_jitter (diff) | |
| download | synapse-f9b255cd62fe724e16b2222f6af623b2d39282ab.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions