summary refs log tree commit diff
path: root/synapse/handlers/directory.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:19:49 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:19:49 +0000
commitc515d377973560a6e9d96fa5ee53e1de7dc67347 (patch)
treeec58161881f5d9180a41bb8610152cfe5ff0ddc5 /synapse/handlers/directory.py
parentFix bug where we superfluously asked for current state. Change API of /query_... (diff)
parentMerge branch 'rejections_storage' of github.com:matrix-org/synapse into repli... (diff)
downloadsynapse-c515d377973560a6e9d96fa5ee53e1de7dc67347.tar.xz
Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections
Conflicts:
	synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synapse/handlers/directory.py')
0 files changed, 0 insertions, 0 deletions