Merge branch 'main' of http://synbox.ruv.wtf:8418/litruv/cinny-desktop

2026-02-24 22:29:41 +11:00
parent 796659318e bd544193be
commit 31225233c5
1 changed files with 6 additions and 0 deletions
--- a/package.json
+++ b/package.json
@@ -1,8 +1,14 @@
 {
  "name": "paarrot",
+<<<<<<< HEAD
  "version": "4.11.23",
  "description": "Paarrot - A Matrix client based on Cinny",
  "homepage": "http://synbox.ruv.wtf:8418/litruv/cinny-desktop",
+=======
+  "version": "4.11.24",
+  "description": "Yet another matrix client",
+  "homepage": "https://github.com/ajbura/cinny",
+>>>>>>> bd544193be537882c7c69a153c38cc211293c741
  "main": "electron/main.js",
  "engines": {
    "node": ">=18.0.0"