Skip to content

Commit

Permalink
NTR: Merge branch 'master' into users/vm/NTR-refactor-repositories
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitalij Mik committed Dec 19, 2024
2 parents 0e0046d + 6b17e33 commit 67a8a4d
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ jobs:
php: '8.2'
- shopware: '6.4.20.2'
php: '8.2'
- shopware: '6.4.1.0'
- shopware: '6.4.5.0'
php: '7.4'
steps:

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/nightly_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,6 @@ jobs:
php: '7.4'
- shopware: '6.4.5.1'
php: '7.4'
- shopware: '6.4.4.1'
php: '7.4'
- shopware: '6.4.2.1'
php: '7.4'
- shopware: '6.4.1.2'
php: '7.4'
steps:

- name: Clone Code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ jobs:
php: '8.2'
- shopware: '6.4.20.2'
php: '8.2'
- shopware: '6.4.1.0'
- shopware: '6.4.5.0'
php: '7.4'
steps:

Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Features
- Return over Shopware Commercial plugins is now transfered to Mollie when the Return status is set to "Done" and can be cancelled with the "Cancelled" status. Please note that the refund cannot be cancelled after two hours.

### Changes
- Minimum Supported Shopware version is now 6.4.5.0
2 changes: 1 addition & 1 deletion switch-composer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


// >= 6.4.0.0
const SW_VERSIONS_RELEASE = '6.4.1.0 - 6.7.0.0';
const SW_VERSIONS_RELEASE = '6.4.5.0 - 6.7.0.0';
const SW_VERSIONS_DEV = '*';


Expand Down

0 comments on commit 67a8a4d

Please sign in to comment.