Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix-migration-tool
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
#	packages/foundations/package.json
  • Loading branch information
nmerget committed Dec 11, 2024
2 parents 3c8ed70 + b0b52dd commit c0378db
Show file tree
Hide file tree
Showing 33 changed files with 22 additions and 24 deletions.
44 changes: 21 additions & 23 deletions package-lock.json

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

Binary file modified packages/foundations/assets/icons/functional/fonts/all/db-ux.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/foundations/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@csstools/normalize.css": "12.1.1",
"@db-ux/core-icons": "^0.0.7",
"@db-ux/core-icons": "0.0.7",
"cpr": "3.0.1",
"cssnano": "^7.0.6",
"dotenv": "^16.4.7",
Expand Down

0 comments on commit c0378db

Please sign in to comment.