diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-12-22 09:02:46 +0100 |
| commit | b92983fb0cab2a284301b930d2b15ec0109dd93e (patch) | |
| tree | f7fb1b900b3fa5ced46de392a47756c3ca5cc398 /server/src/routes/mod.rs | |
| parent | 9a52852f736692e5319da49478e16bfba30fbd39 (diff) | |
| parent | 826c61c9612e855b19c3adb0e93d80bbfb4dc903 (diff) | |
| download | jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.bz2 jellything-b92983fb0cab2a284301b930d2b15ec0109dd93e.tar.zst | |
Merge branch 'master' of codeberg.org:metamuffin/jellything
Diffstat (limited to 'server/src/routes/mod.rs')
| -rw-r--r-- | server/src/routes/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs index e95d714..4c7838d 100644 --- a/server/src/routes/mod.rs +++ b/server/src/routes/mod.rs @@ -3,10 +3,10 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2023 metamuffin <metamuffin.org> */ -use crate::{database::Database, federation::Federation, routes::ui::error::MyResult}; +use crate::{database::Database, routes::ui::error::MyResult}; use api::{r_api_account_login, r_api_node_raw, r_api_root, r_api_version}; use base64::Engine; -use jellybase::CONF; +use jellybase::{CONF, federation::Federation}; use log::warn; use progress::{r_player_progress, r_player_watched}; use rand::random; |