nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'famedly/master' into develop

Browse source
This commit is contained in:
Timo Kösters 2021-04-14 10:26:28 +02:00
commit abddfc2d2a
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
10 changed files with 147 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/client_server/membership.rs
View file

@ -22,8 +22,7 @@ use ruma::{
serde::{to_canonical_value, CanonicalJsonObject, Raw},
EventId, RoomId, RoomVersionId, ServerName, UserId,
};
use std::sync::RwLock;
use std::{collections::BTreeMap, convert::TryFrom};
use std::{collections::BTreeMap, convert::TryFrom, sync::RwLock};
#[cfg(feature = "conduit_bin")]
use rocket::{get, post};