diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-12-04 15:24:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-04 15:24:16 +0000 |
| commit | c530f9af4d8b15fc4f2610fbbe894336f44e53b1 (patch) | |
| tree | cd5c3b142e755588924d646a03614682d626665b /synapse/api | |
| parent | Markdownification and other fixes to CONTRIBUTING (#6461) (diff) | |
| parent | Un-remove room purge test (diff) | |
| download | synapse-c530f9af4d8b15fc4f2610fbbe894336f44e53b1.tar.xz | |
Merge pull request #6329 from matrix-org/babolivier/context_filters
Filter state, events_before and events_after in /context requests
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 3 | ||||
| -rw-r--r-- | synapse/api/filtering.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 69cef369a5..0ade47e624 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd # Copyright 2017 Vector Creations Ltd -# Copyright 2018 New Vector 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. diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index bec13f08d8..6eab1f13f0 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- # Copyright 2015, 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. |