From: single-right-quote <34298117+single-right-quote@users.noreply.github.com>
Date: Thu, 9 Sep 2021 04:04:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/main'
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cc42d597d3d2f59cf471e33168a244024e4d2e3e;p=mastodon.git

Merge remote-tracking branch 'origin/main'
---

cc42d597d3d2f59cf471e33168a244024e4d2e3e
diff --cc yarn.lock
index a30c9588d,9a64633c9..1180bb147
--- a/yarn.lock
+++ b/yarn.lock
@@@ -11017,12 -10761,13 +10763,12 @@@ ts-essentials@^2.0.3
    resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
    integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
  
- tsconfig-paths@^3.10.1:
-   version "3.10.1"
-   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
-   integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
+ tsconfig-paths@^3.11.0:
+   version "3.11.0"
+   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
+   integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
    dependencies:
 -    "@types/json5" "^0.0.29"
 -    json5 "^1.0.1"
 +    json5 "^2.2.0"
      minimist "^1.2.0"
      strip-bom "^3.0.0"