mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-11-13 12:16:54 +00:00
fix: Fix merge problems, update to resolvematrix 0.1.0
This commit is contained in:
6 files changed
+598
-935
No files matched your search
@@ -20,7 +20,7 @@ use conduwuit::{
|
||||
};
|
||||
use futures::{FutureExt, StreamExt, TryStreamExt};
|
||||
use lettre::message::Mailbox;
|
||||
use resolvematrix::server::{MatrixResolver, ResolvedDestination};
|
||||
use resolvematrix::{resolution::ResolvedDestination, server::MatrixResolver};
|
||||
use ruma::{
|
||||
CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId,
|
||||
OwnedRoomOrAliasId, OwnedServerName, RoomId, RoomVersionId, UInt,
|
||||
|
||||
Reference in new issue
Block a user