Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse
Bump version, changelog and upgrade.rst
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0
Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse
Add note about rerunning setup.py develop
typoe
SYN-153: Fix formatting of federation error message
Merge branch 'master' into develop
Use tagged version of matrix-angular-sdk
Merge branch 'master' into develop
CaptchaServerHttpClient should extend the base, not matrix http client.
Refactor the HTTP clients a little.
Merge branch 'http_client_refactor' into pushers
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
Use module loggers rather than the root logger. Exceptions caused by bad clients shouldn't cause ERROR level logging. Fix sql logging to use 'repr' rather than 'str'
Fix pep8 codestyle warnings
Merge branch 'develop' into pushers