fix rebase conflicts

2026-07-30 21:10:22 +03:00
parent c582230659
commit 0ed770be93
26 changed files with 635 additions and 134 deletions
@@ -67,6 +67,9 @@
        "displayName": {
          "type": "string"
        },
+        "description": {
+          "type": "string"
+        },
        "link": {
          "type": "string"
        },
@@ -110,6 +113,9 @@
        "displayName": {
          "type": "string"
        },
+        "description": {
+          "type": "string"
+        },
        "link": {
          "type": "string"
        },