summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-05 10:33:41 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-05 10:33:41 -0500
commit58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12 (patch)
tree711215f7fe3121b61e7cd32d57ec47cec3ee5671 /scripts-dev
parentImplement third party identifier invites (diff)
parentAdd 'trusted_private_chat' to room creation presets (diff)
downloadsynapse-58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12.tar.xz
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'scripts-dev')
0 files changed, 0 insertions, 0 deletions