summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 17:43:12 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 17:43:12 +0100
commitc7788685b061dc1fbbecc07e472570f99f36dca3 (patch)
treef01b04d22e4d487bd61c96768154e5e4b6498b10 /synapse/api
parentFix indentation (diff)
downloadsynapse-c7788685b061dc1fbbecc07e472570f99f36dca3.tar.xz
Fix bad merge
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions