Skip to content

Commit

Permalink
Merge branch '4' into 5
Browse files Browse the repository at this point in the history
# Conflicts:
#	tests/php/Tasks/LinkFieldMigrationTaskTest.php
#	yarn.lock
  • Loading branch information
GuySartorelli committed Sep 11, 2024
2 parents 018d6ef + 8f02aea commit 27039a2
Show file tree
Hide file tree
Showing 3 changed files with 1,251 additions and 1,427 deletions.
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
"webpack-cli": "^5.0.0"
},
"dependencies": {
"@apollo/client": "^3.7.1",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
Expand Down
Loading

0 comments on commit 27039a2

Please sign in to comment.