summary refs log tree commit diff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-02 17:21:17 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-02 17:21:17 +0000
commitc9f5af1de7b70a405ca1ee7ce301d59a51435b98 (patch)
tree8f61c4d8866734cf344742612ecdad1d425ae362 /.gitignore
parentRemove editor junk (diff)
parentSYN-187: Set a more sensible default for the content_addr (diff)
downloadsynapse-c9f5af1de7b70a405ca1ee7ce301d59a51435b98.tar.xz
Merge branch 'master' into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions