diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-15 17:20:38 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-15 17:20:38 +0100 |
commit | 8cfad2e68630115a5ac4c3572b2183635c3ff029 (patch) | |
tree | 0649489c05db884455483d804304afcaa0cef509 /synapse/app | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff) | |
parent | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus (diff) | |
download | synapse-8cfad2e68630115a5ac4c3572b2183635c3ff029.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions