diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-01-13 11:46:07 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-01-13 11:46:07 +0000 |
| commit | f4dad9f63995c8aa493ef884f793ee0155549a50 (patch) | |
| tree | 879daa5a1d430dadc74df56bbf1c97136381b59f /synapse/config/appservice.py | |
| parent | Delete the table objects from TransactionStore (diff) | |
| parent | bulk_get_push_rules should handle empty lists (diff) | |
| download | synapse-f4dad9f63995c8aa493ef884f793ee0155549a50.tar.xz | |
Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into markjh/table_name
Conflicts: synapse/storage/push_rule.py
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions