diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 10:33:41 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 10:33:41 -0500 |
| commit | 58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12 (patch) | |
| tree | 711215f7fe3121b61e7cd32d57ec47cec3ee5671 /tox.ini | |
| parent | Implement third party identifier invites (diff) | |
| parent | Add 'trusted_private_chat' to room creation presets (diff) | |
| download | synapse-58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions