Merge origin/master into hermes/hermes-4fd30995

server-rs/crates/api-server/src/main.rs

@@ -13,6 +13,7 @@ mod auth_payload;
 mod auth_public_user;
 mod auth_session;
 mod auth_sessions;
+mod bark_battle;
 mod big_fish;
 mod big_fish_agent_turn;
 mod big_fish_draft_compiler;
@@ -34,6 +35,8 @@ mod custom_world_asset_prompts;
 mod custom_world_foundation_draft;
 mod custom_world_result_prompts;
 mod custom_world_rpg_draft_prompts;
+mod edutainment_baby_drawing;
+mod edutainment_baby_object;
 mod error_middleware;
 mod generated_image_assets;
 mod health;