diff options
author | Erik Johnston <erik@matrix.org> | 2017-07-06 13:57:45 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-07-06 13:57:45 +0100 |
commit | 1f64207f266d99cacdb98f1afdda6d091ecec354 (patch) | |
tree | a6b657fc4b8a7700d90182fe9b5266ee6ef5dac2 /res | |
parent | Merge pull request #2334 from matrix-org/erikj/refactor_transport_server (diff) | |
parent | Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse (diff) | |
download | synapse-1f64207f266d99cacdb98f1afdda6d091ecec354.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions