diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-13 13:32:43 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-10-13 13:32:43 +0100 |
| commit | 32a453d7ba43f4bbf7160761858367072fe8c43f (patch) | |
| tree | 3fb96db58bc18f76b2f22bee85824d7024435791 /contrib | |
| parent | Merge branch 'develop' into daniel/3pidinvites (diff) | |
| parent | Merge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff) | |
| download | synapse-32a453d7ba43f4bbf7160761858367072fe8c43f.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions