char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into deps

Browse source
This commit is contained in:
Timo Kösters 2020-10-16 14:06:14 +02:00
commit dfcfab5b7e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client_server/media.rs
View file

@ -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(