summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-02-27 10:46:36 +0000
committerRichard van der Hoff <richard@matrix.org>2020-02-27 10:46:36 +0000
commit69111a8b2a35d90458178a3cb865338d2969b055 (patch)
tree8e7d5d930a5116386fa8825dff61146ae395797f /scripts-dev
parentRevert "skip send without trailing slash" (diff)
parentStore room version on invite (#6983) (diff)
downloadsynapse-69111a8b2a35d90458178a3cb865338d2969b055.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'scripts-dev')
-rw-r--r--scripts-dev/convert_server_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py

index 179be61c30..06b4c1e2ff 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py
@@ -103,7 +103,7 @@ def main(): yaml.safe_dump(result, sys.stdout, default_flow_style=False) - rows = list(row for server, json in result.items() for row in rows_v2(server, json)) + rows = [row for server, json in result.items() for row in rows_v2(server, json)] cursor = connection.cursor() cursor.executemany(