diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-25 12:35:25 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-25 12:35:25 +0000 |
commit | d685ae73b481d1503324b09b57583a867b3fa8df (patch) | |
tree | ce7fde3d2b93e116a042ce63dfcdacd5d23c537a /synapse/config/appservice.py | |
parent | Merge pull request #523 from matrix-org/dbkr/no_push_unless_notify (diff) | |
parent | Fix tests (diff) | |
download | synapse-d685ae73b481d1503324b09b57583a867b3fa8df.tar.xz |
Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions