Merge branch 'master' of https://git.waifuism.life/nyanide/pleroma-fe

Font Awesome and fix supa long twkn text
2 changed files with 4 additions and 4 deletions
--- a/package.json
+++ b/package.json
@ -18,9 +18,9 @@
  "dependencies": {
    "@babel/runtime": "7.21.5",
    "@chenfengyuan/vue-qrcode": "2.0.0",
-    "@fortawesome/fontawesome-svg-core": "6.4.0",
-    "@fortawesome/free-regular-svg-icons": "6.4.0",
-    "@fortawesome/free-solid-svg-icons": "6.4.0",
+    "@fortawesome/fontawesome-svg-core": "6.1.2",
+    "@fortawesome/free-regular-svg-icons": "6.1.2",
+    "@fortawesome/free-solid-svg-icons": "6.1.2",
    "@fortawesome/vue-fontawesome": "3.0.3",
    "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
    "@kazvmoe-infra/unicode-emoji-json": "0.4.0",
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -172,7 +172,7 @@
    "public_tl": "Public timeline",
    "timeline": "Timeline",
    "home_timeline": "Timeline",
-    "twkn": "The Whole Known Network",
+    "twkn": "TWKN",
    "bookmarks": "Bookmarks",
    "user_search": "User Search",
    "search": "Search",
Author	SHA1	Message	Date
Kirby	239341342c	Merge branch 'master' of https://git.waifuism.life/nyanide/pleroma-fe	3 weeks ago
Kirby	a4b95f33dd	Font Awesome and fix supa long twkn text	3 weeks ago