Eric Eastwood 7024d7b86e Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry ... Conflicts: synapse/logging/opentracing.py tests/logging/test_opentracing.py		2022-08-09 14:46:03 -05:00
..
.gitignore	Correct attrs package name in requirements (#3492)	2018-07-07 10:46:59 +10:00
13400.feature	Add changelog	2022-08-02 14:32:45 -05:00
13453.misc	Allow use of both @trace and @tag_args stacked on the same function (#13453)	2022-08-09 14:32:33 -05:00
13471.misc	Strengthen tests about deleted old push actions. (#13471)	2022-08-09 07:56:16 -04:00
13479.misc	Use literals in place of HTTPStatus constants in tests (#13479)	2022-08-09 14:56:43 +01:00