Merge remote-tracking branch 'origin/main' into save-conversations

2023-06-23 09:09:42 +02:00
parent ff07d0c2ed a305d93567
commit 6f0efec146
112 changed files with 4161 additions and 1653 deletions
@@ -412,6 +412,7 @@
      "ctrl-shift-k": "editor::DeleteLine",
      "cmd-shift-d": "editor::DuplicateLine",
      "cmd-shift-l": "editor::SplitSelectionIntoLines",
+      "ctrl-j": "editor::JoinLines",
      "ctrl-cmd-up": "editor::MoveLineUp",
      "ctrl-cmd-down": "editor::MoveLineDown",
      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",