logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: a6134471055935dcbb94d9b2ed69dc8c2cf57832
parent f71f101fce21ec053d46556928393a5f05f16239
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Fri,  1 Apr 2022 13:03:13 +0000

Merge branch 'from/develop/tusooa/phoenix-1.6.2' into 'develop'

Fix phoenix at 1.6.2

See merge request pleroma/pleroma-fe!1502

Diffstat:

Mpackage.json1+
Myarn.lock8++++----
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json @@ -34,6 +34,7 @@ "localforage": "1.10.0", "parse-link-header": "1.0.1", "phoenix": "1.4.0", + "phoenix": "1.6.2", "punycode.js": "2.1.0", "qrcode": "1", "ruffle-mirror": "2021.12.31", diff --git a/yarn.lock b/yarn.lock @@ -7423,10 +7423,10 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" -phoenix@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.4.0.tgz#9cec8dbd8cbc59ecd2147bc09ca8ceb56b860d75" - integrity sha512-+M7erjPRtrHM53Bc9sT/WSyNFOEhsAc48PBsex0R87hu0GhBRMNE2uAb8MT2gKtJmAYxv5Quaozh/PBuhO8tdQ== +phoenix@1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.6.2.tgz#8d1d9f06e51cb893d08059e80488cd0de328e01a" + integrity sha512-VjR27NETvrLSj8rI6DlpVAfo7pCYth/9+1OCoTof4LKEbq0141ze/tdxFHHZzVQSok3gqJUo2h/tqbxR3r8eyw== picocolors@^1.0.0: version "1.0.0"