Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development' into feature/XW-94/…
Browse files Browse the repository at this point in the history
…Dymanic-pagination-limit
  • Loading branch information
remko48 committed Oct 17, 2023
2 parents 13d5b1c + ba361f7 commit 04c016b
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 45 deletions.
155 changes: 111 additions & 44 deletions pwa/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 pwa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
},
"dependencies": {
"@conduction/components": "2.2.17",
"@conduction/theme": "1.0.48",
"@conduction/theme": "1.0.49",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.1.18",
Expand Down

0 comments on commit 04c016b

Please sign in to comment.