diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-07 11:11:17 +0100 |
| commit | a28d0667329a65b6c187a85befd4f95f89a550b0 (patch) | |
| tree | e8b44087781b8707c458f9b886effd09f5ad9990 /tox.ini | |
| parent | Tests (diff) | |
| parent | Merge pull request #703 from matrix-org/erikj/member (diff) | |
| download | synapse-a28d0667329a65b6c187a85befd4f95f89a550b0.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions