Skip to content

Commit

Permalink
Merge branch 'development' into recoil-to-jotai
Browse files Browse the repository at this point in the history
  • Loading branch information
Zasa-san authored Apr 15, 2024
2 parents bce457e + ebbc215 commit 6a822e9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
"prom-client": "^15.1.1",
"prop-types": "^15.8.1",
"qrcode.react": "^3.1.0",
"qs": "^6.10.1",
"qs": "^6.12.1",
"react": "^18.2.0",
"react-color": "^2.19.3",
"react-datepicker": "6.6.0",
Expand Down Expand Up @@ -305,7 +305,7 @@
"@types/node-uuid": "^0.0.28",
"@types/nodemailer": "^6.4.4",
"@types/prop-types": "^15.7.3",
"@types/qs": "^6.9.6",
"@types/qs": "^6.9.14",
"@types/react": "^18.0.25",
"@types/react-dnd": "^3.0.2",
"@types/react-dom": "^18.0.9",
Expand Down
17 changes: 12 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5715,10 +5715,10 @@
dependencies:
"@types/node" "*"

"@types/qs@*", "@types/qs@^6.9.5", "@types/qs@^6.9.6":
version "6.9.7"
resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
"@types/qs@*", "@types/qs@^6.9.14", "@types/qs@^6.9.5":
version "6.9.14"
resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.14.tgz#169e142bfe493895287bee382af6039795e9b75b"
integrity sha512-5khscbd3SwWMhFqylJBLQ0zIu7c1K6Vz0uBIt915BI3zV0q1nfjRQD3RqSBcPaO6PHEF4ov/t9y89fSiyThlPA==

"@types/range-parser@*":
version "1.2.3"
Expand Down Expand Up @@ -16756,13 +16756,20 @@ qs@6.10.4:
dependencies:
side-channel "^1.0.4"

qs@6.11.0, qs@^6.10.0, qs@^6.10.1, qs@^6.11.0:
qs@6.11.0:
version "6.11.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
dependencies:
side-channel "^1.0.4"

qs@^6.10.0, qs@^6.11.0, qs@^6.12.1:
version "6.12.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.1.tgz#39422111ca7cbdb70425541cba20c7d7b216599a"
integrity sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==
dependencies:
side-channel "^1.0.6"

querystring-es3@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
Expand Down

0 comments on commit 6a822e9

Please sign in to comment.