merge: upstream/main into main

resources/guis.yml

@@ -35,15 +35,15 @@ guis:
   price: Free
   license: GNU GPL
   order: 4
-- name: GitKraken
+- name: GitKraken Desktop
   url: https://www.gitkraken.com/
-  image_tag: guis/git-kraken@2x.png
+  image_tag: guis/gitkraken-2024@2x.png
   platforms:
   - Windows
   - Mac
   - Linux
   # Free tier only works with local and public repositories
-  price: Free / $59+/user annually
+  price: Free / $48+/user annually
   license: Proprietary
   order: 5
 - name: Magit
@@ -307,7 +307,7 @@ guis:
   license: Proprietary
   order: 42
 - name: GitUI
-  url: https://extrawurst.itch.io/gitui
+  url: http://gitui.org
   image_tag: guis/[email protected]
   platforms:
   - Windows
@@ -460,4 +460,13 @@ guis:
   license: MIT
   trend_name: pragma github
   order: 54
-
+- name: GitKraken CLI
+  url: https://github.com/gitkraken/gk-cli
+  image_tag: guis/[email protected]
+  platforms:
+  - Windows
+  - Mac
+  - Linux
+  price: Free / $48.00+/user annually
+  license: Proprietary
+  order: 55