🔀 Merge branch 'trunk'

# Conflicts:
#	modules/ppcp-settings/resources/js/data/common/action-types.js
#	modules/ppcp-settings/resources/js/data/common/controls.js
#	modules/ppcp-settings/resources/js/data/common/hooks.js
#	modules/ppcp-settings/services.php
This commit is contained in:
Philipp Stracker 2025-01-03 11:03:18 +01:00
commit 9a84c7b4a9
No known key found for this signature in database
52 changed files with 2318 additions and 1462 deletions

View file

@ -181,6 +181,7 @@ class SettingsModule implements ServiceModule, ExecutableModule {
$container->get( 'settings.rest.common' ),
$container->get( 'settings.rest.connect_manual' ),
$container->get( 'settings.rest.login_link' ),
$container->get( 'settings.rest.webhooks' ),
$container->get( 'settings.rest.refresh_feature_status' ),
);