diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-08 16:52:09 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-08 16:52:09 +0100 |
| commit | 5c688739d68ea8d87a668115a32acaee222dc3ca (patch) | |
| tree | b93cea250a9a748c3f9e3931f4ed08e26043a5ed /tox.ini | |
| parent | Add delta file (diff) | |
| parent | Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard (diff) | |
| download | synapse-5c688739d68ea8d87a668115a32acaee222dc3ca.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reindex_state_groups
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions