Skip to content

Commit

Permalink
Merge branch 'dev' into JoeKarow/redesign-updates
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
#	pnpm-lock.yaml
  • Loading branch information
JoeKarow committed Sep 19, 2024
2 parents 08e347b + 8bf2c62 commit 250e89f
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 266 deletions.
2 changes: 2 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
files:
- source: /public/locales/en/*.json
translation: /public/locales/%two_letters_code%/%original_file_name%
type: i18next_json
update_option: 'update_as_unapproved'
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@mantine/form": "7.12.2",
"@mantine/hooks": "7.12.2",
"@neondatabase/serverless": "0.9.5",
"@next/bundle-analyzer": "14.2.11",
"@next/bundle-analyzer": "14.2.12",
"@prisma/adapter-neon": "5.19.1",
"@prisma/client": "5.19.1",
"@storybook/test": "8.3.1",
Expand All @@ -60,7 +60,7 @@
"i18next-http-backend": "2.6.1",
"i18next-resources-to-backend": "1.2.1",
"nanoid": "5.0.7",
"next": "14.2.11",
"next": "14.2.12",
"next-i18n-router": "5.5.1",
"next-sitemap": "4.2.3",
"react": "18.3.1",
Expand Down Expand Up @@ -94,7 +94,7 @@
"dotenv": "16.4.5",
"dotenv-cli": "7.4.2",
"eslint": "8.57.1",
"eslint-config-next": "14.2.11",
"eslint-config-next": "14.2.12",
"eslint-config-prettier": "9.1.0",
"eslint-formatter-github": "1.1.4",
"eslint-import-resolver-typescript": "3.6.3",
Expand Down
Loading

0 comments on commit 250e89f

Please sign in to comment.