diff options
author | Erik Johnston <erik@matrix.org> | 2023-12-13 15:11:56 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2023-12-13 15:11:56 +0000 |
commit | eaad9bb156d324e35c10b0e9139fb2ce615ecc0b (patch) | |
tree | 4bfe3cf776afcac008d5936fb86a6edb1f97ed3a /synapse/replication/http/membership.py | |
parent | Revert changes to README (diff) | |
parent | Update license headers (diff) | |
download | synapse-eaad9bb156d324e35c10b0e9139fb2ce615ecc0b.tar.xz |
Merge remote-tracking branch 'gitlab/clokep/license-license' into new_develop
Diffstat (limited to 'synapse/replication/http/membership.py')
-rw-r--r-- | synapse/replication/http/membership.py | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/synapse/replication/http/membership.py b/synapse/replication/http/membership.py index 67b01db67e..fc66039b2f 100644 --- a/synapse/replication/http/membership.py +++ b/synapse/replication/http/membership.py @@ -1,16 +1,22 @@ -# Copyright 2018 New Vector Ltd # -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +# This file is licensed under the Affero General Public License (AGPL) version 3. +# +# Copyright (C) 2023 New Vector, Ltd +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# See the GNU Affero General Public License for more details: +# <https://www.gnu.org/licenses/agpl-3.0.html>. +# +# Originally licensed under the Apache License, Version 2.0: +# <http://www.apache.org/licenses/LICENSE-2.0>. +# +# [This file includes modifications made by New Vector Limited] # -# http://www.apache.org/licenses/LICENSE-2.0 # -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. import logging from typing import TYPE_CHECKING, List, Optional, Tuple |