Merge remote-tracking branch 'parent/main' into upstream-20240913

2024-09-13 10:31:48 +09:00 · 2024-09-13 10:31:48 +09:00 · fc9d27ff91
commit fc9d27ff91
parent 3277819b62 202077517c
392 changed files with 3757 additions and 3233 deletions
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@ -349,8 +349,8 @@ class UI extends PureComponent {

    try {
      e.dataTransfer.dropEffect = 'copy';
-    } catch (err) {
-
+    } catch {
+      // do nothing
    }

    return false;