diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-16 11:34:48 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-16 11:34:48 +0000 |
| commit | feedaa37fa5a4522f7929cddf8fff0b30015a476 (patch) | |
| tree | e94a84f912f109d57d598335159358d2e982ab62 /synapse/storage/push_rule.py | |
| parent | Branch off member and non member sends (diff) | |
| parent | Merge pull request #577 from matrix-org/daniel/createroom (diff) | |
| download | synapse-feedaa37fa5a4522f7929cddf8fff0b30015a476.tar.xz | |
Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts: synapse/handlers/room.py
Diffstat (limited to 'synapse/storage/push_rule.py')
0 files changed, 0 insertions, 0 deletions