diff options
author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-04 22:41:52 +1000 |
---|---|---|
committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-04 22:41:52 +1000 |
commit | d86794325f770f4d4e9a13a993809a53b58d9122 (patch) | |
tree | 42b83cb83e654a1bb89d5da4a2c69ac843ed2ee9 /MANIFEST.in | |
parent | Merge pull request #3999 from matrix-org/erikj/fix_3pid_invite_rejetion (diff) | |
parent | changelog (diff) | |
download | synapse-d86794325f770f4d4e9a13a993809a53b58d9122.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions