diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-28 18:57:23 +1000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-05-28 18:57:23 +1000 |
| commit | 754826a8305b3f32a45367cb6bd8bb26bd489a6b (patch) | |
| tree | c5aba5e1e720474b3f94d15bd9202bda0b120e20 /synapse/rest/consent | |
| parent | pepeightttt (diff) | |
| parent | Merge pull request #3288 from matrix-org/rav/no_spam_guests (diff) | |
| download | synapse-754826a8305b3f32a45367cb6bd8bb26bd489a6b.tar.xz | |
Merge remote-tracking branch 'origin/develop' into 3218-official-prom
Diffstat (limited to 'synapse/rest/consent')
0 files changed, 0 insertions, 0 deletions