diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2019-11-26 10:53:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-26 10:53:48 +0000 |
commit | 4c1b799e1b9f8e04f6cd86a0977e28685ac20aea (patch) | |
tree | fcaea2671bf38721520191c13bb37adf18ef84c5 /synapse/util/httpresourcetree.py | |
parent | Format changelog (diff) | |
parent | Make sure that we close cursors before returning from a query (#6408) (diff) | |
download | synapse-4c1b799e1b9f8e04f6cd86a0977e28685ac20aea.tar.xz |
Merge branch 'develop' into babolivier/context_filters
Diffstat (limited to 'synapse/util/httpresourcetree.py')
-rw-r--r-- | synapse/util/httpresourcetree.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/httpresourcetree.py b/synapse/util/httpresourcetree.py index 1a20c596bf..3c0e8469f3 100644 --- a/synapse/util/httpresourcetree.py +++ b/synapse/util/httpresourcetree.py @@ -20,7 +20,7 @@ logger = logging.getLogger(__name__) def create_resource_tree(desired_tree, root_resource): - """Create the resource tree for this Home Server. + """Create the resource tree for this homeserver. This in unduly complicated because Twisted does not support putting child resources more than 1 level deep at a time. |