summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2024-01-23 15:30:03 +0000
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2024-01-23 15:30:03 +0000
commitd5e213e16f98ff247d89bc6a4f5d2e494b0b9efe (patch)
tree823ab2bac8da6a8d2e9223aaf2227f41a852e096 /synapse/appservice
parentSpeed up e2e device keys queries for bot accounts (diff)
parentUpdate changelog (diff)
downloadsynapse-d5e213e16f98ff247d89bc6a4f5d2e494b0b9efe.tar.xz
Merge branch 'release-v1.100' into matrix-org-hotfixes
Diffstat (limited to '')
-rw-r--r--synapse/appservice/__init__.py2
-rw-r--r--synapse/appservice/api.py2
-rw-r--r--synapse/appservice/scheduler.py1
3 files changed, 5 insertions, 0 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py

index a392e61cf6..a96cdbf1e7 100644 --- a/synapse/appservice/__init__.py +++ b/synapse/appservice/__init__.py
@@ -1,6 +1,8 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2022 The Matrix.org Foundation C.I.C. +# Copyright 2015, 2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py
index 4747f02e12..34fa2bb655 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py
@@ -1,6 +1,8 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2022 The Matrix.org Foundation C.I.C. +# Copyright 2015, 2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify diff --git a/synapse/appservice/scheduler.py b/synapse/appservice/scheduler.py
index f93068314f..bec83419a2 100644 --- a/synapse/appservice/scheduler.py +++ b/synapse/appservice/scheduler.py
@@ -1,6 +1,7 @@ # # This file is licensed under the Affero General Public License (AGPL) version 3. # +# Copyright 2015, 2016 OpenMarket Ltd # Copyright (C) 2023 New Vector, Ltd # # This program is free software: you can redistribute it and/or modify