Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/minimatch-3.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
brandongallagher1999 authored Nov 28, 2022
2 parents 7c29be3 + 4ea8bef commit 0803c3e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Brandon Gallagher",
"license": "ISC",
"dependencies": {
"axios": "^1.1.1",
"axios": "^1.2.0",
"discord.js": "^14.5.0",
"fs": "0.0.1-security",
"torrent-search-api": "git+https://github.com/brandongallagher1999/torrent-search-api.git",
Expand All @@ -28,7 +28,7 @@
"@types/torrent-search-api": "^2.0.0",
"babel-jest": "^28.1.3",
"jest": "^28.1.1",
"prettier": "2.7.1"
"prettier": "2.8.0"
},
"optionalDependencies": {
"fsevents": "^2.3.2"
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1570,10 +1570,10 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==

axios@*, axios@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.1.tgz#ce2fd17b4517150e0ff475922a70453d5e3f7f37"
integrity sha512-hUo0TDluM7WPGeM2834mualoT0vGt9vcA+02dgfCiSpSPGdKbMhNbnTUwDf5hs6e4oc8yO7jGI33sSKtW7FRDQ==
axios@*, axios@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.0.tgz#1cb65bd75162c70e9f8d118a905126c4a201d383"
integrity sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
Expand Down Expand Up @@ -3717,10 +3717,10 @@ prelude-ls@~1.1.2:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=

prettier@2.7.1:
version "2.7.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
prettier@2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==

pretty-format@^27.0.0, pretty-format@^27.5.1:
version "27.5.1"
Expand Down

0 comments on commit 0803c3e

Please sign in to comment.