merge: upstream performance changes & instance silencing

2023-10-16 23:38:21 +02:00
parent 9e74455320 9338ab461e
commit 68886b9ab5
209 changed files with 1064 additions and 1019 deletions
@@ -203,6 +203,7 @@ export interface Locale {
    "perDay": string;
    "stopActivityDelivery": string;
    "blockThisInstance": string;
+    "silenceThisInstance": string;
    "operations": string;
    "software": string;
    "version": string;
@@ -222,6 +223,8 @@ export interface Locale {
    "clearCachedFilesConfirm": string;
    "blockedInstances": string;
    "blockedInstancesDescription": string;
+    "silencedInstances": string;
+    "silencedInstancesDescription": string;
    "muteAndBlock": string;
    "mutedUsers": string;
    "blockedUsers": string;