diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:36 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-13 10:58:50 +0100 |
| commit | 984e207b5982df26bec37223cd07b4044dcacdd2 (patch) | |
| tree | 9b7cd2052ab91b4365bb43f46d2509b389bf1bab /tests/api | |
| parent | Merge branch 'develop' into server2server_signing (diff) | |
| parent | remove wishlist in favour of jira (diff) | |
| download | synapse-984e207b5982df26bec37223cd07b4044dcacdd2.tar.xz | |
Merge branch develop into server2server_signing
Conflicts: synapse/app/homeserver.py
Diffstat (limited to 'tests/api')
0 files changed, 0 insertions, 0 deletions