Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking

This commit is contained in:
Neil Johnson 2018-08-17 14:34:10 +01:00
commit 3ee57bdcbb
9 changed files with 75 additions and 24 deletions

1
changelog.d/3707.misc Normal file
View file

@ -0,0 +1 @@
add new error type ResourceLimit