Merge branch 'develop' into babolivier/message_retention

This commit is contained in:
Brendan Abolivier 2019-11-26 17:53:57 +00:00
commit 9e937c28ee
138 changed files with 2594 additions and 1268 deletions

View file

@ -457,7 +457,7 @@ def cs_error(msg, code=Codes.UNKNOWN, **kwargs):
class FederationError(RuntimeError):
""" This class is used to inform remote home servers about erroneous
""" This class is used to inform remote homeservers about erroneous
PDUs they sent us.
FATAL: The remote server could not interpret the source event.