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

2024-04-17 12:51:32 +09:00 · 2024-04-17 12:51:32 +09:00 · 51cf7b3eb4
commit 51cf7b3eb4
parent 1c054ed3a3 5915bd7f45
76 changed files with 835 additions and 307 deletions
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@ -102,7 +102,7 @@ const mapStateToProps = state => ({
 const keyMap = {
  help: '?',
  new: 'n',
-  search: 's',
+  search: ['s', '/'],
  forceNew: 'option+n',
  toggleComposeSpoilers: 'option+x',
  focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],