summary refs log tree commit diff
path: root/synapse/static
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-06 17:28:55 +0000
committerDavid Baker <dave@matrix.org>2016-01-06 17:28:55 +0000
commit442fcc02f70fd0ae0034fc15c79b9e521c3d0143 (patch)
tree9d20a280a761ac50f227ebb8e4b8c74d354bb8df /synapse/static
parentAdding is_guest here won't work because it just constructs a dict of uid -> p... (diff)
parentMerge pull request #469 from matrix-org/markjh/joined_guest_access (diff)
downloadsynapse-442fcc02f70fd0ae0034fc15c79b9e521c3d0143.tar.xz
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/static')
0 files changed, 0 insertions, 0 deletions