diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-20 18:00:28 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-09-20 18:00:28 -0500 |
| commit | b86869feef313d57fe8e2169224b3e87a595bf13 (patch) | |
| tree | 36a30fef154141835c5c76d6de17c695c9142dd3 /synapse/storage/engines/_base.py | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| parent | Merge branch 'release-v1.68' into develop (diff) | |
| download | synapse-b86869feef313d57fe8e2169224b3e87a595bf13.tar.xz | |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: .github/workflows/tests.yml poetry.lock synapse/storage/schema/__init__.py
Diffstat (limited to 'synapse/storage/engines/_base.py')
0 files changed, 0 insertions, 0 deletions