summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorAmber H. Brown <hawkowl@atleastfornow.net>2020-02-27 23:18:16 +1100
committerAmber H. Brown <hawkowl@atleastfornow.net>2020-02-27 23:18:16 +1100
commitf004ceed71086691ed824648bbca5186b28e581d (patch)
tree9541c6d08bab92d116e50b47b8a5a12bf1184b99 /scripts-dev
parentfixes (diff)
parentStore room version on invite (#6983) (diff)
downloadsynapse-f004ceed71086691ed824648bbca5186b28e581d.tar.xz
Merge remote-tracking branch 'origin/develop' into hawkowl/cache-config-without-synctl
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(