diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-08-20 00:16:18 +0100 |
| commit | 6e80c03d45c3d09a7e7457f58beff69f14034964 (patch) | |
| tree | 06d05072f93e410dbccba1437d7fd5a545c10b86 /synapse/federation/federation_base.py | |
| parent | Explicit join (diff) | |
| parent | Merge pull request #1032 from matrix-org/matthew/workerdoc (diff) | |
| download | synapse-6e80c03d45c3d09a7e7457f58beff69f14034964.tar.xz | |
Merge branch 'develop' into dbkr/notifications_api
Diffstat (limited to 'synapse/federation/federation_base.py')
0 files changed, 0 insertions, 0 deletions