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

2024-03-12 09:27:01 +09:00 · 2024-03-12 09:27:01 +09:00 · 8e94ed2cec
commit 8e94ed2cec
parent fa96bf2e87 24319836de
204 changed files with 5112 additions and 1998 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -31,7 +31,7 @@ Rails.application.routes.draw do
    /antennasw/(*any)
    /antennast/(*any)
    /circles/(*any)
-    /notifications
+    /notifications/(*any)
    /favourites
    /emoji_reactions
    /bookmarks