diff options
author | Eric Eastwood <erice@element.io> | 2022-09-09 16:28:05 -0500 |
---|---|---|
committer | Eric Eastwood <erice@element.io> | 2022-09-09 16:28:05 -0500 |
commit | 50f0342594977a57793225d8f6b95e1225dfe308 (patch) | |
tree | bb8c94e3316a8623780d37a98e1f55aa2bc19c4a /rust/src/lib.rs | |
parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
parent | Concurrently collect room unread counts for push badges (#13765) (diff) | |
download | synapse-50f0342594977a57793225d8f6b95e1225dfe308.tar.xz |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: poetry.lock synapse/api/auth.py synapse/federation/federation_client.py synapse/logging/opentracing.py synapse/rest/client/keys.py synapse/rest/client/sendtodevice.py synapse/storage/schema/__init__.py
Diffstat (limited to 'rust/src/lib.rs')
-rw-r--r-- | rust/src/lib.rs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/rust/src/lib.rs b/rust/src/lib.rs new file mode 100644 |