summary refs log tree commit diff
path: root/synapse/groups
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-26 10:15:32 +0200
committerJason Robinson <jasonr@matrix.org>2021-01-26 10:15:32 +0200
commitcee4010f94f8f4dadbdaadac5a62c54c19e17505 (patch)
treea73dc2cc9375f445402a4534adf4bc779c1d0d37 /synapse/groups
parentMake natural join inner join (diff)
parentDon't error if deleting a non-existent pusher. (#9121) (diff)
downloadsynapse-cee4010f94f8f4dadbdaadac5a62c54c19e17505.tar.xz
Merge branch 'develop' into jaywink/admin-forward-extremities
# Conflicts:
#	synapse/rest/admin/__init__.py
Diffstat (limited to 'synapse/groups')
0 files changed, 0 insertions, 0 deletions