summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-01-13 11:46:07 +0000
committerMark Haines <mark.haines@matrix.org>2016-01-13 11:46:07 +0000
commitf4dad9f63995c8aa493ef884f793ee0155549a50 (patch)
tree879daa5a1d430dadc74df56bbf1c97136381b59f /synapse/api
parentDelete the table objects from TransactionStore (diff)
parentbulk_get_push_rules should handle empty lists (diff)
downloadsynapse-f4dad9f63995c8aa493ef884f793ee0155549a50.tar.xz
Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name
Conflicts:
	synapse/storage/push_rule.py
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions