diff options
| author | Eric Eastwood <erice@element.io> | 2022-08-09 14:50:10 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-08-09 14:50:10 -0500 |
| commit | 2a467fd26b369d937a04da950d9ecaf8f23aa382 (patch) | |
| tree | f2c9f654a0f67d7bbcdf459b9b4a918923d041ca /synapse/config/experimental.py | |
| parent | Only set attribute if going forward (diff) | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| download | synapse-2a467fd26b369d937a04da950d9ecaf8f23aa382.tar.xz | |
Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemods/13356-messages-investigation-scratch-v1
Conflicts: pyproject.toml synapse/logging/tracing.py
Diffstat (limited to 'synapse/config/experimental.py')
| -rw-r--r-- | synapse/config/experimental.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py |