diff options
author | Erik Johnston <erik@matrix.org> | 2018-05-09 15:32:07 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-05-09 15:32:07 +0100 |
commit | cddf91c8b942167feb1e1b87e3c3e80dbc7fa02f (patch) | |
tree | cda316a97bc6538074c66cb6267ce23f0793ec78 /synapse/storage/push_rule.py | |
parent | Remove unused code path from member change DB func (diff) | |
parent | Merge pull request #3196 from matrix-org/erikj/pagination_return (diff) | |
download | synapse-cddf91c8b942167feb1e1b87e3c3e80dbc7fa02f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_membership_change
Diffstat (limited to 'synapse/storage/push_rule.py')
0 files changed, 0 insertions, 0 deletions