summary refs log tree commit diff
path: root/synapse/rest/client/versions.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-12-10 11:25:28 +0000
committerNeil Johnson <neil@matrix.org>2019-12-10 11:25:28 +0000
commit0a522121a0801e5474397b4f01730bf1896bc497 (patch)
tree80b491e8965c0a99127e33789ac28c39ae660ad4 /synapse/rest/client/versions.py
parentMerge branch 'release-v1.6.1' of github.com:matrix-org/synapse into matrix-or... (diff)
parentFix erroneous reference for new room directory defaults. (diff)
downloadsynapse-0a522121a0801e5474397b4f01730bf1896bc497.tar.xz
Merge branch 'release-v1.7.0' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/versions.py')
-rw-r--r--synapse/rest/client/versions.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py

index bb30ce3f34..2a477ad22e 100644 --- a/synapse/rest/client/versions.py +++ b/synapse/rest/client/versions.py
@@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- # Copyright 2016 OpenMarket Ltd +# Copyright 2017 Vector Creations Ltd +# Copyright 2018-2019 New Vector Ltd +# Copyright 2019 The Matrix.org Foundation C.I.C. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.