Merge branch 'master' into deps

dfcfab5b · Timo Kösters · 9d138795 · 15fa7fb1 · dfcfab5b
Commit dfcfab5b authored 4 years ago by Timo Kösters
--- a/src/client_server/media.rs
+++ b/src/client_server/media.rs
@@ -11,7 +11,7 @@
 use rocket::{get, post};
 use std::convert::TryInto;

-const MXC_LENGTH: usize = 256;
+const MXC_LENGTH: usize = 32;

 #[cfg_attr(feature = "conduit_bin", get("/_matrix/media/r0/config"))]
 pub fn get_media_config_route(