Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	package.json
This commit is contained in:
Mark Henry 2023-01-12 10:40:13 -07:00
commit f73e29e30d
No known key found for this signature in database

View file

@ -33,7 +33,7 @@
},
"devDependencies": {
"@types/jest": "^27.4.1",
"@types/node": "^18.11.15",
"@types/node": "^18.11.18",
"@typescript-eslint/parser": "^5.48.1",
"@vercel/ncc": "^0.36.0",
"eslint": "^8.31.0",