summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-26 13:14:59 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-26 13:14:59 +0000
commit14ff33bd93152027990bb7d961e0be98bf1c26b5 (patch)
tree96092b7759947da81d12450ad49c712d845cf02d /synapse/handlers
parentAdd client v2_alpha resource to synapse server resource tree (diff)
parentAdd client v2_alpha resource to synapse server resource tree (diff)
downloadsynapse-14ff33bd93152027990bb7d961e0be98bf1c26b5.tar.xz
Merge branch 'develop' into client_v2_sync
Conflicts:
	synapse/rest/client/v2_alpha/__init__.py
Diffstat (limited to 'synapse/handlers')
0 files changed, 0 insertions, 0 deletions