Merge branch 'master' into gav-tweak-gov2

paritytech · gavofyork · Dec 5, 2022 · Nov 30, 2022 · Nov 30, 2022 · Dec 1, 2022
commit 18429a6ccb86b18e88019398c14bc815b1c8136a
diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -633,8 +633,8 @@ parameter_types! {
 impl pallet_treasury::Config for Runtime {
 	type PalletId = TreasuryPalletId;
 	type Currency = Balances;
-	type ApproveOrigin = Treasurer;
-	type RejectOrigin = Treasurer;
+	type ApproveOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
+	type RejectOrigin = EitherOfDiverse<EnsureRoot<AccountId>, Treasurer>;
 	type RuntimeEvent = RuntimeEvent;
 	type OnSlash = Treasury;
 	type ProposalBond = ProposalBond;