summary refs log tree commit diff
path: root/scripts-dev/convert_server_keys.py
diff options
context:
space:
mode:
authorAmber H. Brown <hawkowl@atleastfornow.net>2019-07-02 18:31:29 +1000
committerAmber H. Brown <hawkowl@atleastfornow.net>2019-07-02 18:31:29 +1000
commit4689408a35e6ff9b7b18a5940e79d15e6b846913 (patch)
tree4bf2c4347abb712bf7cad0040809409cc8cd6c72 /scripts-dev/convert_server_keys.py
parentrelease shhs on tags (diff)
parentfix async/await consentresource (#5585) (diff)
downloadsynapse-4689408a35e6ff9b7b18a5940e79d15e6b846913.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs
Diffstat (limited to 'scripts-dev/convert_server_keys.py')
-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 ac152b5c42..179be61c30 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py
@@ -116,5 +116,5 @@ def main(): connection.commit() -if __name__ == '__main__': +if __name__ == "__main__": main()