Skip to content

Commit

Permalink
Merge pull request #87 from alma/chore/temp_develop
Browse files Browse the repository at this point in the history
Resolve develop conflicts
  • Loading branch information
joyet-simon authored Oct 11, 2023
2 parents 3db5153 + 498db60 commit 2fa777a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout current repo in CI
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ repos:
hooks:
- id: check-branch-name
args:
- "-r^((chore|ci|dependabot|devx|docs|feature|fix|hotfix|hotfix-backport|infra|other|perf|refactor|security|test)\/.+|(snyk)-.+|main|HEAD)$$"
- "-r^((chore|ci|dependabot|devx|docs|feature|fix|hotfix|hotfix-backport|infra|other|perf|refactor|security|test)\/.+|(snyk)-.+|main|HEAD|develop)$$"
4 changes: 4 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ v4.5.0
* Feat: add Deferred Capture feature.
* Chore: add pre-commit tool.

v4.4.0
------
* Feat: In Page checkout

v4.3.1
------
* Feat: add Pay Now with credit card with Alma.
Expand Down

0 comments on commit 2fa777a

Please sign in to comment.