composer merge

2026-08-26 18:41:54 +03:00
parent 90e32e337d 4923bf82c3
commit 36ff25657d
3 changed files with 12 additions and 4 deletions
@@ -565,11 +565,19 @@
        },
        {
            "name": "boboko/core",
+<<<<<<< HEAD
            "version": "0.5.3",
            "source": {
                "type": "git",
                "url": "https://code.radical-elements.com/boboko/core.git",
                "reference": "09844ec2b5e26792722031b9dc2faa49205f6778"
+=======
+            "version": "0.5.4",
+            "source": {
+                "type": "git",
+                "url": "https://code.radical-elements.com/boboko/core.git",
+                "reference": "ef9e9daab0aed2f65d5db40a838d9047ba02dd68"
+>>>>>>> elv
            },
            "require": {
                "laravel/framework": "^12.0",
@@ -610,7 +618,7 @@
                }
            },
            "description": "Core module — authentication and shared panel behaviour",
-            "time": "2026-08-26T11:29:29+00:00"
+            "time": "2026-08-26T15:34:26+00:00"
        },
        {
            "name": "brick/math",