diff options
author | Erik Johnston <erik@matrix.org> | 2018-07-19 10:26:13 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-07-19 10:26:13 +0100 |
commit | 742f75733701e345b9e717ac16537b82a00aa452 (patch) | |
tree | c785759d5ea7176def6fe2b52832a1ad7a89561b /synapse/storage/push_rule.py | |
parent | Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff) | |
parent | Merge pull request #3554 from matrix-org/erikj/response_metrics_code (diff) | |
download | synapse-742f75733701e345b9e717ac16537b82a00aa452.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/push_rule.py')
0 files changed, 0 insertions, 0 deletions