summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-04 07:38:38 +0100
committerErik Johnston <erik@matrix.org>2014-09-04 07:38:38 +0100
commit9f633bc1252ceb98999fb74c56cc3e3914067743 (patch)
treec0bbbd3a7718508571bc0eb3b3500a369cbd2d5b /tests
parentbig warning (diff)
parentmake synctl default to homesever.log (diff)
downloadsynapse-9f633bc1252ceb98999fb74c56cc3e3914067743.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Conflicts:
	CHANGES.rst
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions