summary refs log tree commit diff
path: root/synapse/server_notices/server_notices_manager.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-15 17:20:38 +0100
committerNeil Johnson <neil@matrix.org>2018-08-15 17:20:38 +0100
commit8cfad2e68630115a5ac4c3572b2183635c3ff029 (patch)
tree0649489c05db884455483d804304afcaa0cef509 /synapse/server_notices/server_notices_manager.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff)
parentMerge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus (diff)
downloadsynapse-8cfad2e68630115a5ac4c3572b2183635c3ff029.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/server_notices/server_notices_manager.py')
0 files changed, 0 insertions, 0 deletions