Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/SP-667' into feature/SP-674
# Conflicts: # BitPayLib/class-bitpaycancelorder.php # BitPayLib/class-bitpaycart.php # BitPayLib/class-bitpaycheckouttransactions.php # BitPayLib/class-bitpayclientfactory.php # BitPayLib/class-bitpayinvoicecreate.php # BitPayLib/class-bitpayipnprocess.php # BitPayLib/class-bitpaylogger.php # BitPayLib/class-bitpaypages.php # BitPayLib/class-bitpaypaymentsettings.php # BitPayLib/class-bitpaypluginsetup.php # BitPayLib/class-wcgatewaybitpay.php # BitPayLib/trait-wpdbhelper.php # CHANGELOG.md # index.php # readme.txt # vendorPrefixed/BitPayLib/class-bitpaycancelorder.php # vendorPrefixed/BitPayLib/class-bitpaycart.php # vendorPrefixed/BitPayLib/class-bitpaycheckouttransactions.php # vendorPrefixed/BitPayLib/class-bitpayclientfactory.php # vendorPrefixed/BitPayLib/class-bitpayinvoicecreate.php # vendorPrefixed/BitPayLib/class-bitpayipnprocess.php # vendorPrefixed/BitPayLib/class-bitpaylogger.php # vendorPrefixed/BitPayLib/class-bitpaypages.php # vendorPrefixed/BitPayLib/class-bitpaypaymentsettings.php # vendorPrefixed/BitPayLib/class-bitpaypluginsetup.php # vendorPrefixed/BitPayLib/class-wcgatewaybitpay.php # vendorPrefixed/BitPayLib/trait-wpdbhelper.php # vendorPrefixed/vendor/composer/installed.php
- Loading branch information