Merge branch '5.x-dev' into dev-json-logs

matomo-org · Jan 28, 2025 · 718d399 · 718d399
2 parents b93f56f + 49462b8
commit 718d399
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 23 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/...stem/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml b/...stem/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml
@@ -19,4 +19,5 @@
 	<row>EkiohFlow</row>
 	<row>Arachne</row>
 	<row>LibWeb</row>
+	<row>Maple</row>
 </result>
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
diff --git a/plugins/CustomVariables b/plugins/CustomVariables
diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting
diff --git a/...creenshots/Marketplace_paid_plugins_with_license_managePluginsUrl_superuser.png b/...creenshots/Marketplace_paid_plugins_with_license_managePluginsUrl_superuser.png
diff --git a/...lace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png b/...lace/tests/UI/expected-screenshots/Marketplace_updates_multiUserEnvironment.png
diff --git a/...ins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png b/...ins/Marketplace/tests/UI/expected-screenshots/Marketplace_updates_superuser.png
diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons
diff --git a/plugins/Provider b/plugins/Provider
diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo
diff --git a/plugins/TagManager b/plugins/TagManager
diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml