Merge remote-tracking branch 'origin/next' into command-refactor

Fixed a small conflict in admin.rs
2022-02-03 20:28:43 +02:00
parent 6399a7fe4e 79345dc2a6
commit b56efcdc2a
25 changed files with 147 additions and 169 deletions
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -33,7 +33,6 @@ use serde_json::value::to_raw_value;
 use std::{
    borrow::Cow,
    collections::{BTreeMap, HashMap, HashSet},
-    convert::{TryFrom, TryInto},
    fmt::Debug,
    iter,
    mem::size_of,