diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-27 17:37:33 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-27 17:37:33 +0000 |
commit | fa90c180ee88822947ac2d1b758348d3f9405fe9 (patch) | |
tree | 2d05b995d4867811526e63d2480a3f253bf3d450 /contrib | |
parent | Fix tests (diff) | |
parent | Merge pull request #530 from matrix-org/erikj/server_refactor (diff) | |
download | synapse-fa90c180ee88822947ac2d1b758348d3f9405fe9.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions