diff options
| author | Eric Eastwood <erice@element.io> | 2022-08-02 15:05:27 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-08-02 15:05:27 -0500 |
| commit | 72c718df54c3c1dd02fd208020dfc6ccbb241870 (patch) | |
| tree | bbc71e033e6c21161ec7984b6e28a37a55971aff /scripts-dev/complement.sh | |
| parent | Seems to (see test_side_by_side_spans) (diff) | |
| parent | Add a `merge-back` command to the release script, which automates merging the... (diff) | |
| download | synapse-72c718df54c3c1dd02fd208020dfc6ccbb241870.tar.xz | |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: docs/usage/configuration/config_documentation.md synapse/logging/opentracing.py Got changes from: - https://github.com/matrix-org/synapse/pull/13362/files
Diffstat (limited to 'scripts-dev/complement.sh')
| -rwxr-xr-x | scripts-dev/complement.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh |