Merge branch 'develop' into feature/2024.9.0

# Conflicts: # packages/frontend/src/pages/instance-info.vue
2024-10-11 14:06:21 -04:00
parent 7837852149 f3e6b43ea4
commit 148bf98f21
6 changed files with 28 additions and 23 deletions
@@ -1050,6 +1050,10 @@ export interface Locale extends ILocale {
     * 連合中
     */
    "federating": string;
+    /**
+     * Blocking you
+     */
+    "blockingYou": string;
    /**
     * ブロック中
     */