寝不足なので 
65d9004ac (upstream/master) Add UI for enabling/disabling poll notifications (#10255)
c6f018091 i18n: Add Japanese translations for new landing page (#10254)
06663fcf8 Fix `tagged` param not being normalized before querying tags (#10249)
d4ef90eae Fix to limit to discoverable accounts. (#10253)
0a6840564 Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252)
9f5b55ad4 Fix poll update handler calling method was that was not available (#10246)
a41afef80 Optimize RemoveStatusService by removing n+1 query and using shared inboxes (#10247)
5b50c2cba Add muted style for polls in web UI (#10248)
da45b8b4c Fix public timeline page not paginating correctly (#10245)
CONFLICT (content): Merge conflict in config/locales/ja.yml
AGPLって明記してるからねー
$ git diff config/locales/ja.yml
diff --cc config/locales/ja.yml
index 3ba6db1a4,2bc665426..000000000
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@@ -18,7 -26,9 +26,13 @@@ ja
hosted_on: Mastodon hosted on %{domain}
learn_more: もっと詳しく
privacy_policy: プライバシーポリシー
++<<<<<<< HEAD
+ source_code: ソースコード (AGPL)
++=======
+ see_whats_happening: 何が起きているのか見てみる
+ server_stats: 'サーバー統計:'
+ source_code: ソースコード
++>>>>>>> master
status_count_after:
one: トゥート
other: トゥート