summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-04 19:08:27 +0100
committerErik Johnston <erik@matrix.org>2016-05-04 19:08:27 +0100
commitfee1118a207f1f07f21c3b8bf52d40c4f891bbcb (patch)
treec563ec6102a9899981b51bfc51945a3d9baef664 /synapse/server.py
parentImplement basic ignore user (diff)
parentMerge pull request #762 from matrix-org/erikj/report_event (diff)
downloadsynapse-fee1118a207f1f07f21c3b8bf52d40c4f891bbcb.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions