summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2019-03-12 17:15:21 +0000
committerNeil Johnson <neil@fragile.org.uk>2019-03-12 17:15:21 +0000
commit332b60ec68f3f5ddc5d25326b5fbe3a69f27f23b (patch)
treeb8a691915768113d341b6c53665e49f23c1800a0 /synapse
parentTransfer local user's push rules on room upgrade (#4838) (diff)
parentfix orphaned sentence (diff)
downloadsynapse-332b60ec68f3f5ddc5d25326b5fbe3a69f27f23b.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions