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

2021-04-14 10:26:28 +02:00
parent 5951294638 b427395648
commit abddfc2d2a
10 changed files with 147 additions and 40 deletions
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
 #![warn(rust_2018_idioms)]
+#![allow(clippy::suspicious_else_formatting)]

 pub mod appservice_server;
 pub mod client_server;