summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-11-18 15:48:30 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-11-18 15:48:30 +0000
commite9f587ecbaf5b60183d7c56108d76bb5f76a98f4 (patch)
tree5cf7df273b613b88902016722ca8f2d1c222cf19 /demo
parentInclude room members' presence in room initialSync (diff)
parentNull check when determining default power levels (diff)
downloadsynapse-e9f587ecbaf5b60183d7c56108d76bb5f76a98f4.tar.xz
Merge remote-tracking branch 'origin/develop' into room-initial-sync
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions