summary refs log tree commit diff
path: root/synapse/rest/client/v1/directory.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-15 14:38:27 +0000
committerDaniel Wagner-Hall <daniel@matrix.org>2016-02-15 14:38:27 +0000
commitdbeed36dec021df3036e088910c72d5727910dd3 (patch)
treef98ced054476684af05d2ce6fb4b4066fd56ecd4 /synapse/rest/client/v1/directory.py
parentRevert "Merge two of the room join codepaths" (diff)
downloadsynapse-dbeed36dec021df3036e088910c72d5727910dd3.tar.xz
Merge some room joining codepaths
Force joining by alias to go through the send_membership_event checks,
rather than bypassing them straight into _do_join. This is the first of
many stages of cleanup.
Diffstat (limited to 'synapse/rest/client/v1/directory.py')
0 files changed, 0 insertions, 0 deletions