Merge branch 'media-download-with-filename' into 'next'

Media download with filename See merge request famedly/conduit!266
2022-01-27 15:44:56 +00:00
parent ba8d5abb67 c4317a7a96
commit 63309e52f8
2 changed files with 93 additions and 27 deletions
--- a/src/main.rs
+++ b/src/main.rs
@@ -129,6 +129,7 @@ fn setup_rocket(config: Figment, data: Arc<RwLock<Database>>) -> rocket::Rocket<
                client_server::send_event_to_device_route,
                client_server::get_media_config_route,
                client_server::create_content_route,
+                client_server::get_content_as_filename_route,
                client_server::get_content_route,
                client_server::get_content_thumbnail_route,
                client_server::get_devices_route,