diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 17:43:12 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 17:43:12 +0100 |
commit | c7788685b061dc1fbbecc07e472570f99f36dca3 (patch) | |
tree | f01b04d22e4d487bd61c96768154e5e4b6498b10 /scripts | |
parent | Fix indentation (diff) | |
download | synapse-c7788685b061dc1fbbecc07e472570f99f36dca3.tar.xz |
Fix bad merge
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions