Skip to content

Merge origin/trunk into epic/ECTO-2267 - #208

Merged
Kai Gossel (kaigossel) merged 16 commits into
epic/ECTO-2267from
epic/ECTO-2267-update
Sep 7, 2026
Merged

Merge origin/trunk into epic/ECTO-2267#208
Kai Gossel (kaigossel) merged 16 commits into
epic/ECTO-2267from
epic/ECTO-2267-update

Conversation

@kaigossel

Copy link
Copy Markdown
Collaborator

No description provided.

Copilot AI and others added 16 commits May 23, 2026 06:41
…ionObject() (#158)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
…tions (#177)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: roboshyim <roboshyim@users.noreply.github.com>
# Conflicts:
#	composer.json
#	src/Resources/app/administration/src/module/sw-dashboard/page/sw-dashboard-index/sw-dashboard-index.html.twig
#	src/Resources/app/administration/src/module/sw-extension-store/page/sw-extension-store-detail/index.js
#	src/Resources/app/administration/src/module/sw-extension-store/page/sw-extension-store-detail/sw-extension-store-detail.html.twig
#	src/Resources/app/administration/src/module/sw-extension-store/page/sw-extension-store-detail/sw-extension-store-detail.spec.js
#	src/Resources/app/administration/src/module/sw-extension-store/snippet/de.json
#	src/Resources/app/administration/src/module/sw-extension-store/snippet/en.json
#	src/Resources/app/administration/src/module/sw-in-app-purchases/component/sw-in-app-purchase-checkout/index.ts
#	src/Resources/app/administration/src/module/sw-payments/component/sw-payments-dashboard-promotion-card/sw-payments-dashboard-promotion-card.html.twig
#	src/Resources/app/administration/src/module/sw-payments/component/sw-payments-dashboard-promotion-card/sw-payments-dashboard-promotion-card.scss
#	src/Resources/app/administration/src/module/sw-payments/component/sw-payments-dashboard-promotion-card/sw-payments-dashboard-promotion-card.spec.js
#	src/Resources/app/administration/src/util/telemetry.ts
#	tests/Controller/DataControllerTest.php
#	tests/Services/StoreDataProviderTest.php
@kaigossel
Kai Gossel (kaigossel) merged commit f94f37b into epic/ECTO-2267 Sep 7, 2026
3 checks passed
@kaigossel
Kai Gossel (kaigossel) deleted the epic/ECTO-2267-update branch September 7, 2026 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants