Skip to content

Commit

Permalink
Merge 4.x into 5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI authored Jul 4, 2023
2 parents 971dd53 + 729ce86 commit d3854a8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 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
Expand Up @@ -7,7 +7,7 @@
"admin-lte": "^2.4",
"bootstrap": "^3.3",
"icheck": "^1.0",
"jquery": "^3.6",
"jquery": "^3.7.0",
"jquery-form": "^4.3",
"jquery-slimscroll": "^1.3",
"jquery-ui": "^1.13",
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/app.js

Large diffs are not rendered by default.

0 comments on commit d3854a8

Please sign in to comment.