diff options
| author | Erik Johnston <erik@matrix.org> | 2016-05-04 19:08:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-05-04 19:08:27 +0100 |
| commit | fee1118a207f1f07f21c3b8bf52d40c4f891bbcb (patch) | |
| tree | c563ec6102a9899981b51bfc51945a3d9baef664 /synapse/appservice | |
| parent | Implement basic ignore user (diff) | |
| parent | Merge pull request #762 from matrix-org/erikj/report_event (diff) | |
| download | synapse-fee1118a207f1f07f21c3b8bf52d40c4f891bbcb.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions