diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-15 15:42:44 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-09-15 15:42:44 +0100 |
commit | 9fc0aad567254efe82bc9093f5eb07e0a991356b (patch) | |
tree | 74649ee09434e392809ab63b80a621a78f49d40e /.gitignore | |
parent | Merge branch 'daniel/insecureclient' into develop (diff) | |
parent | Bump version/changelog (diff) | |
download | synapse-9fc0aad567254efe82bc9093f5eb07e0a991356b.tar.xz |
Merge branch 'master' into daniel/insecureclient
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions