diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-15 11:51:55 +0100 |
| commit | f38df51e8dd8e462871c9bfb8fb49a89d157bf2d (patch) | |
| tree | 08736d0f751f3ee3ee8f0c8f7b1cbce5de5569a7 /tox.ini | |
| parent | Use more descriptive error code (diff) | |
| parent | Merge pull request #305 from matrix-org/markjh/v2_sync_api (diff) | |
| download | synapse-f38df51e8dd8e462871c9bfb8fb49a89d157bf2d.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions