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/main.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/main.rs')
| -rw-r--r-- | server/src/main.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index 6e732bd..d9ddf8b 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -8,16 +8,13 @@ use crate::routes::ui::{account::hash_password, admin::log::enable_logging}; use database::Database; -use federation::Federation; -use jellybase::CONF; +use jellybase::{CONF, federation::Federation}; use jellycommon::user::{PermissionSet, Theme, User}; use log::{error, warn}; use routes::build_rocket; use tokio::fs::create_dir_all; pub use jellybase::database; -pub mod federation; -pub mod import; pub mod routes; #[rocket::main] |