Merge branch 'master' of http://synbox.ruv.wtf:8418/litruv/cinny-mobile

2026-04-15 22:14:24 +10:00
parent 85851d7288 47f1b2c40f
commit 3fe00eb3d7
1 changed files with 4 additions and 0 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,10 @@
 {
  "name": "paarrot",
+<<<<<<< HEAD
  "version": "4.11.66",
+=======
+  "version": "4.11.83",
+>>>>>>> 47f1b2c40f38dfeb985a1965fe4222614cdfcf23
  "description": "Paarrot - A Matrix client based on Cinny",
  "engines": {
    "node": ">=18.0.0"