Merge remote-tracking branch 'origin/feat/elasticsearch' into feat/elasticsearch

Browse Source

Signed-off-by: Zomatree <me@zomatree.live>

# Conflicts:
#	Cargo.lock
#	compose.yml
#	crates/core/config/src/lib.rs
#	crates/core/database/src/models/messages/ops.rs
#	crates/core/database/src/models/messages/ops/mongodb.rs
#	crates/core/database/src/models/messages/ops/reference.rs
#	crates/delta/src/routes/servers/server_delete.rs

...

This commit is contained in:

Zomatree

2026-03-29 06:07:10 +01:00

parent fb487130c8 d568b4369e

commit 7ec3b07f6c

2 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files