Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
SimonMayerhofer committed May 7, 2021
2 parents 074f6e4 + 35d2c3f commit cffb0bb
Show file tree
Hide file tree
Showing 2 changed files with 3,840 additions and 25,777 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v2

- uses: actions/setup-node@v1.4.4
- uses: actions/setup-node@v2
with:
node-version: 14.x

Expand Down
Loading

0 comments on commit cffb0bb

Please sign in to comment.