diff options
| author | Eric Eastwood <erice@element.io> | 2022-11-18 16:37:36 -0600 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-11-18 16:37:36 -0600 |
| commit | d993cb0b1c9efeebe52f40b8bdb871d02718c6d0 (patch) | |
| tree | 9d68187784d5db6bdc242387af5400b141ab995a /synapse/util/ratelimitutils.py | |
| parent | Fix poetry.lock conflicts (diff) | |
| parent | Fix /key/v2/server calls with URL-unsafe key IDs (#14490) (diff) | |
| download | synapse-d993cb0b1c9efeebe52f40b8bdb871d02718c6d0.tar.xz | |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: docs/usage/configuration/config_documentation.md poetry.lock synapse/handlers/message.py synapse/http/server.py synapse/logging/opentracing.py synapse/rest/client/keys.py synapse/rest/client/room.py
Diffstat (limited to 'synapse/util/ratelimitutils.py')
| -rw-r--r-- | synapse/util/ratelimitutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/ratelimitutils.py b/synapse/util/ratelimitutils.py |