Merge remote-tracking branch 'entropy-xu/payment-billing-plans'

# Conflicts:
#	crates/aether-data/src/lifecycle/bootstrap/postgres.rs
#	crates/aether-data/src/lifecycle/migrate/tests.rs
#	frontend/src/views/admin/Users.vue
This commit is contained in:
fawney19
2026-05-15 16:37:17 +08:00
97 changed files with 14795 additions and 402 deletions
Generated
+1
View File
@@ -219,6 +219,7 @@ dependencies = [
"hmac",
"http",
"ldap3",
"md-5",
"parking_lot",
"regex",
"reqwest",