Merge branch 'hotfixes-v0.6.0a'

2014-12-29 14:01:07 +00:00
parent 407c299828 af61c29527
commit f588db49fe
1 changed files with 1 additions and 0 deletions
--- a/synapse/media/v1/base_resource.py
+++ b/synapse/media/v1/base_resource.py
@@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
            @download.addBoth
            def callback(media_info):
                del self.downloads[key]
+                return media_info
        return download

    @defer.inlineCallbacks