Merge branch 'main' into feat/provider_portal
# Conflicts: # src/app.rs
This commit is contained in:
commit
c6f0a2e5e5
32 files changed
+2544
-138
No files matched your search
+7
-1
@@ -1,9 +1,15 @@
|
||||
mod about_page;
|
||||
mod api;
|
||||
mod comparison_test;
|
||||
mod home_page;
|
||||
mod loaner_page;
|
||||
mod provider_portal;
|
||||
mod scholarship_info;
|
||||
mod test_page;
|
||||
mod unauthenticated_page;
|
||||
mod utils;
|
||||
|
||||
pub use self::{
|
||||
about_page::*, home_page::*, provider_portal::*, test_page::*, unauthenticated_page::*,
|
||||
about_page::*, comparison_test::*, home_page::*, loaner_page::LoanerPage, provider_portal::*,
|
||||
test_page::*, unauthenticated_page::*,
|
||||
};
|
||||
Reference in new issue
Block a user