summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-27 17:37:33 +0000
committerErik Johnston <erik@matrix.org>2016-01-27 17:37:33 +0000
commitfa90c180ee88822947ac2d1b758348d3f9405fe9 (patch)
tree2d05b995d4867811526e63d2480a3f253bf3d450 /contrib
parentFix tests (diff)
parentMerge pull request #530 from matrix-org/erikj/server_refactor (diff)
downloadsynapse-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