Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0

Conflicts:
	synapse/state.py

1 files changed, 1 insertions, 0 deletions

diff --git a/synapse/media/v1/base_resource.py b/synapse/media/v1/base_resource.py

index 14735ff375..2f5440ab64 100644
--- a/synapse/media/v1/base_resource.py
+++ b/synapse/media/v1/base_resource.py
@@ -135,6 +135,7 @@ class BaseMediaResource(Resource):
         if download is None:
             download = self._get_remote_media_impl(server_name, media_id)
             self.downloads[key] = download
+
             @download.addBoth
             def callback(media_info):
                 del self.downloads[key]