Merge branch 'master' into deps
commit
dfcfab5b7e
|
@ -11,7 +11,7 @@ use ruma::api::client::{
|
||||||
use rocket::{get, post};
|
use rocket::{get, post};
|
||||||
use std::convert::TryInto;
|
use std::convert::TryInto;
|
||||||
|
|
||||||
const MXC_LENGTH: usize = 256;
|
const MXC_LENGTH: usize = 32;
|
||||||
|
|
||||||
#[cfg_attr(feature = "conduit_bin", get("/_matrix/media/r0/config"))]
|
#[cfg_attr(feature = "conduit_bin", get("/_matrix/media/r0/config"))]
|
||||||
pub fn get_media_config_route(
|
pub fn get_media_config_route(
|
||||||
|
|
Loading…
Reference in New Issue