summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-08-27 17:28:55 +0100
committerMark Haines <mark.haines@matrix.org>2014-08-27 17:28:55 +0100
commit357dd1871d5d7d9761321ddc7092abac9bfe3574 (patch)
tree26a11bd98ec0167d4bf81d6117ad45f50a5e7246 /webclient
parentMerge branch 'develop' into storage_transactions (diff)
parentFix tests. (diff)
downloadsynapse-357dd1871d5d7d9761321ddc7092abac9bfe3574.tar.xz
Merge branch 'develop' into storage_transactions
Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py
Diffstat (limited to 'webclient')
0 files changed, 0 insertions, 0 deletions