Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
JensAstrup committed Mar 28, 2024
2 parents f2d2dc1 + 1c42af7 commit 933c69b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "shortcut-api",
"version": "1.0.0-beta.6",
"version": "1.0.0-beta.7",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"files": [
Expand Down

0 comments on commit 933c69b

Please sign in to comment.