summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-05 14:06:23 +0000
committerErik Johnston <erik@matrix.org>2016-01-05 14:06:23 +0000
commitd74c4e90d4e012a5441a783d6b1ca2592a3da0c7 (patch)
treeccfb4e56f09e4035d56f2e5b0ea87c5550065ea5 /synapse/util
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUse named args (diff)
downloadsynapse-d74c4e90d4e012a5441a783d6b1ca2592a3da0c7.tar.xz
Merge pull request #460 from matrix-org/erikj/create_room_3pid_invite
Support inviting 3pids in /createRoom
Diffstat (limited to 'synapse/util')
0 files changed, 0 insertions, 0 deletions