summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-08-16 01:48:44 +0100
committerMatthew Hodgson <matthew@matrix.org>2014-08-16 01:48:44 +0100
commit00e8be516a12bbb2fe9fe8cdad9a51286b2c5112 (patch)
treeee876ff3b36cfa32a68a065c150d7d573c702f6a /synapse
parentemergency bodges to turn off presence ACLs in order to make (diff)
downloadsynapse-00e8be516a12bbb2fe9fe8cdad9a51286b2c5112.tar.xz
merge weirdness
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions