Merge branch 'refs/heads/trunk' into modularity-module-migration

Browse source

# Conflicts:
#	composer.lock
#	modules/ppcp-axo/src/AxoModule.php
#	modules/ppcp-blocks/src/BlocksModule.php
#	modules/ppcp-compat/src/CompatModule.php
#	modules/ppcp-googlepay/src/GooglepayModule.php
#	modules/ppcp-order-tracking/src/OrderTrackingModule.php
#	modules/ppcp-wc-subscriptions/src/WcSubscriptionsModule.php

...

This commit is contained in:

Moritz Meißelbach 2024-08-23 14:25:36 +02:00

parent cbc8de5a9d 31afc7263e

commit 4d9f23e315

No known key found for this signature in database

GPG key ID: 9FDCE7BEB31FA3E5

301 changed files with 33875 additions and 13196 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

37

modules/ppcp-applepay/src/ApplepayModule.php

View file

File diff suppressed because one or more lines are too long