github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-04 12:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2025-04-20 19:37:12 +08:00
parent f801ae9b63
commit 80507cab27
4 changed files with 94 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
composer.lock generated
View File

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
"version": "v2.2.0", "version": "v2.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/asm89/stack-cors.git", "url": "https://github.com/asm89/stack-cors.git",
"reference": "50f57105bad3d97a43ec4a485eb57daf347eafea" "reference": "acf3142e6c5eafa378dc8ef3c069ab4558993f70"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/asm89/stack-cors/zipball/50f57105bad3d97a43ec4a485eb57daf347eafea", "url": "https://api.github.com/repos/asm89/stack-cors/zipball/acf3142e6c5eafa378dc8ef3c069ab4558993f70",
"reference": "50f57105bad3d97a43ec4a485eb57daf347eafea", "reference": "acf3142e6c5eafa378dc8ef3c069ab4558993f70",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -58,9 +58,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/asm89/stack-cors/issues", "issues": "https://github.com/asm89/stack-cors/issues",
"source": "https://github.com/asm89/stack-cors/tree/v2.2.0" "source": "https://github.com/asm89/stack-cors/tree/v2.3.0"
}, },
"time": "2023-11-14T13:51:46+00:00" "time": "2025-03-13T08:50:04+00:00"
}, },
{ {
"name": "brick/math", "name": "brick/math",
@ -982,16 +982,16 @@
}, },
{ {
"name": "firebase/php-jwt", "name": "firebase/php-jwt",
"version": "v6.11.0", "version": "v6.11.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/firebase/php-jwt.git", "url": "https://github.com/firebase/php-jwt.git",
"reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712" "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/firebase/php-jwt/zipball/8f718f4dfc9c5d5f0c994cdfd103921b43592712", "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
"reference": "8f718f4dfc9c5d5f0c994cdfd103921b43592712", "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1039,9 +1039,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/firebase/php-jwt/issues", "issues": "https://github.com/firebase/php-jwt/issues",
"source": "https://github.com/firebase/php-jwt/tree/v6.11.0" "source": "https://github.com/firebase/php-jwt/tree/v6.11.1"
}, },
"time": "2025-01-23T05:11:06+00:00" "time": "2025-04-09T20:32:01+00:00"
}, },
{ {
"name": "fruitcake/laravel-cors", "name": "fruitcake/laravel-cors",
@ -1335,16 +1335,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "7.9.2", "version": "7.9.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "d281ed313b989f213357e3be1a179f02196ac99b" "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
"reference": "d281ed313b989f213357e3be1a179f02196ac99b", "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1441,7 +1441,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.9.2" "source": "https://github.com/guzzle/guzzle/tree/7.9.3"
}, },
"funding": [ "funding": [
{ {
@ -1457,20 +1457,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-24T11:22:20+00:00" "time": "2025-03-27T13:37:11+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
"version": "2.0.4", "version": "2.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/promises.git", "url": "https://github.com/guzzle/promises.git",
"reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c",
"reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1524,7 +1524,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/promises/issues", "issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/2.0.4" "source": "https://github.com/guzzle/promises/tree/2.2.0"
}, },
"funding": [ "funding": [
{ {
@ -1540,20 +1540,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-10-17T10:06:22+00:00" "time": "2025-03-27T13:27:01+00:00"
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.7.0", "version": "2.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201" "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16",
"reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201", "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1640,7 +1640,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.7.0" "source": "https://github.com/guzzle/psr7/tree/2.7.1"
}, },
"funding": [ "funding": [
{ {
@ -1656,7 +1656,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-07-18T11:15:46+00:00" "time": "2025-03-27T12:30:47+00:00"
}, },
{ {
"name": "hedeqiang/umeng", "name": "hedeqiang/umeng",
@ -2195,16 +2195,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "2.6.1", "version": "2.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "d990688c91cedfb69753ffc2512727ec646df2ad" "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d990688c91cedfb69753ffc2512727ec646df2ad", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/06c3b0bf2540338094575612f4a1778d0d2d5e94",
"reference": "d990688c91cedfb69753ffc2512727ec646df2ad", "reference": "06c3b0bf2540338094575612f4a1778d0d2d5e94",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2298,7 +2298,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2024-12-29T14:10:59+00:00" "time": "2025-04-18T21:09:27+00:00"
}, },
{ {
"name": "league/config", "name": "league/config",
@ -3481,16 +3481,16 @@
}, },
{ {
"name": "nette/utils", "name": "nette/utils",
"version": "v4.0.5", "version": "v4.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nette/utils.git", "url": "https://github.com/nette/utils.git",
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96" "reference": "ce708655043c7050eb050df361c5e313cf708309"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", "url": "https://api.github.com/repos/nette/utils/zipball/ce708655043c7050eb050df361c5e313cf708309",
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96", "reference": "ce708655043c7050eb050df361c5e313cf708309",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3561,9 +3561,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/nette/utils/issues", "issues": "https://github.com/nette/utils/issues",
"source": "https://github.com/nette/utils/tree/v4.0.5" "source": "https://github.com/nette/utils/tree/v4.0.6"
}, },
"time": "2024-08-07T15:39:19+00:00" "time": "2025-03-30T21:06:30+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
@ -4865,16 +4865,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.12.7", "version": "v0.12.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c" "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/85057ceedee50c49d4f6ecaff73ee96adb3b3625",
"reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c", "reference": "85057ceedee50c49d4f6ecaff73ee96adb3b3625",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -4938,9 +4938,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/bobthecow/psysh/issues", "issues": "https://github.com/bobthecow/psysh/issues",
"source": "https://github.com/bobthecow/psysh/tree/v0.12.7" "source": "https://github.com/bobthecow/psysh/tree/v0.12.8"
}, },
"time": "2024-12-10T01:58:33+00:00" "time": "2025-03-16T03:05:19+00:00"
}, },
{ {
"name": "ralouphie/getallheaders", "name": "ralouphie/getallheaders",
@ -5170,16 +5170,16 @@
}, },
{ {
"name": "smalot/pdfparser", "name": "smalot/pdfparser",
"version": "v2.11.0", "version": "v2.12.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/smalot/pdfparser.git", "url": "https://github.com/smalot/pdfparser.git",
"reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6" "reference": "8440edbf58c8596074e78ada38dcb0bd041a5948"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/smalot/pdfparser/zipball/ac8e6678b0940e4b2ccd5caadd3fb18e68093be6", "url": "https://api.github.com/repos/smalot/pdfparser/zipball/8440edbf58c8596074e78ada38dcb0bd041a5948",
"reference": "ac8e6678b0940e4b2ccd5caadd3fb18e68093be6", "reference": "8440edbf58c8596074e78ada38dcb0bd041a5948",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5215,9 +5215,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/smalot/pdfparser/issues", "issues": "https://github.com/smalot/pdfparser/issues",
"source": "https://github.com/smalot/pdfparser/tree/v2.11.0" "source": "https://github.com/smalot/pdfparser/tree/v2.12.0"
}, },
"time": "2024-08-16T06:48:03+00:00" "time": "2025-03-31T13:16:09+00:00"
}, },
{ {
"name": "swiftmailer/swiftmailer", "name": "swiftmailer/swiftmailer",
@ -8008,16 +8008,16 @@
}, },
{ {
"name": "composer/class-map-generator", "name": "composer/class-map-generator",
"version": "1.6.0", "version": "1.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/class-map-generator.git", "url": "https://github.com/composer/class-map-generator.git",
"reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9" "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/class-map-generator/zipball/ffe442c5974c44a9343e37a0abcb1cc37319f5b9", "url": "https://api.github.com/repos/composer/class-map-generator/zipball/134b705ddb0025d397d8318a75825fe3c9d1da34",
"reference": "ffe442c5974c44a9343e37a0abcb1cc37319f5b9", "reference": "134b705ddb0025d397d8318a75825fe3c9d1da34",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8061,7 +8061,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/composer/class-map-generator/issues", "issues": "https://github.com/composer/class-map-generator/issues",
"source": "https://github.com/composer/class-map-generator/tree/1.6.0" "source": "https://github.com/composer/class-map-generator/tree/1.6.1"
}, },
"funding": [ "funding": [
{ {
@ -8077,7 +8077,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2025-02-05T10:05:34+00:00" "time": "2025-03-24T13:50:44+00:00"
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
@ -8285,26 +8285,29 @@
}, },
{ {
"name": "doctrine/deprecations", "name": "doctrine/deprecations",
"version": "1.1.4", "version": "1.1.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/deprecations.git", "url": "https://github.com/doctrine/deprecations.git",
"reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
"reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1 || ^8.0" "php": "^7.1 || ^8.0"
}, },
"conflict": {
"phpunit/phpunit": "<=7.5 || >=13"
},
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^9 || ^12", "doctrine/coding-standard": "^9 || ^12 || ^13",
"phpstan/phpstan": "1.4.10 || 2.0.3", "phpstan/phpstan": "1.4.10 || 2.1.11",
"phpstan/phpstan-phpunit": "^1.0 || ^2", "phpstan/phpstan-phpunit": "^1.0 || ^2",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12",
"psr/log": "^1 || ^2 || ^3" "psr/log": "^1 || ^2 || ^3"
}, },
"suggest": { "suggest": {
@ -8324,9 +8327,9 @@
"homepage": "https://www.doctrine-project.org/", "homepage": "https://www.doctrine-project.org/",
"support": { "support": {
"issues": "https://github.com/doctrine/deprecations/issues", "issues": "https://github.com/doctrine/deprecations/issues",
"source": "https://github.com/doctrine/deprecations/tree/1.1.4" "source": "https://github.com/doctrine/deprecations/tree/1.1.5"
}, },
"time": "2024-12-07T21:18:45+00:00" "time": "2025-04-07T20:06:18+00:00"
}, },
{ {
"name": "doctrine/event-manager", "name": "doctrine/event-manager",
@ -8751,16 +8754,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.17.0", "version": "2.18.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "075bc0c26631110584175de6523ab3f1652eb28e" "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e", "url": "https://api.github.com/repos/filp/whoops/zipball/a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
"reference": "075bc0c26631110584175de6523ab3f1652eb28e", "reference": "a7de6c3c6c3c022f5cfc337f8ede6a14460cf77e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -8810,7 +8813,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/filp/whoops/issues", "issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.17.0" "source": "https://github.com/filp/whoops/tree/2.18.0"
}, },
"funding": [ "funding": [
{ {
@ -8818,7 +8821,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2025-01-25T12:00:00+00:00" "time": "2025-03-15T12:00:00+00:00"
}, },
{ {
"name": "hamcrest/hamcrest-php", "name": "hamcrest/hamcrest-php",
@ -11045,16 +11048,16 @@
}, },
{ {
"name": "swoole/ide-helper", "name": "swoole/ide-helper",
"version": "6.0.0", "version": "6.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/swoole/ide-helper.git", "url": "https://github.com/swoole/ide-helper.git",
"reference": "86a61562a1f1634339ee52f3b8988591f51a2799" "reference": "6f12243dce071714c5febe059578d909698f9a52"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/swoole/ide-helper/zipball/86a61562a1f1634339ee52f3b8988591f51a2799", "url": "https://api.github.com/repos/swoole/ide-helper/zipball/6f12243dce071714c5febe059578d909698f9a52",
"reference": "86a61562a1f1634339ee52f3b8988591f51a2799", "reference": "6f12243dce071714c5febe059578d909698f9a52",
"shasum": "" "shasum": ""
}, },
"type": "library", "type": "library",
@ -11071,9 +11074,9 @@
"description": "IDE help files for Swoole.", "description": "IDE help files for Swoole.",
"support": { "support": {
"issues": "https://github.com/swoole/ide-helper/issues", "issues": "https://github.com/swoole/ide-helper/issues",
"source": "https://github.com/swoole/ide-helper/tree/6.0.0" "source": "https://github.com/swoole/ide-helper/tree/6.0.2"
}, },
"time": "2025-01-03T19:08:24+00:00" "time": "2025-03-23T07:31:41+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",

23
resources/assets/js/mixins/ctrlPressed.js vendored
View File

@ -6,38 +6,31 @@ export const ctrlPressed = {
}, },
created() { created() {
this.handleKeyDown = this.handleKeyDown.bind(this); this.handlePointerdown = this.handlePointerdown.bind(this);
this.handleKeyUp = this.handleKeyUp.bind(this); this.handlePointerup = this.handlePointerup.bind(this);
this.handleBlur = this.handleBlur.bind(this);
}, },
mounted() { mounted() {
document.addEventListener('keydown', this.handleKeyDown); document.addEventListener('pointerdown', this.handlePointerdown);
document.addEventListener('keyup', this.handleKeyUp); document.addEventListener('pointerup', this.handlePointerup);
window.addEventListener('blur', this.handleBlur);
}, },
beforeDestroy() { beforeDestroy() {
document.removeEventListener('keydown', this.handleKeyDown); document.removeEventListener('pointerdown', this.handlePointerdown);
document.removeEventListener('keyup', this.handleKeyUp); document.removeEventListener('pointerup', this.handlePointerup);
window.removeEventListener('blur', this.handleBlur);
}, },
methods: { methods: {
handleKeyDown(event) { handlePointerdown(event) {
if (event.ctrlKey || event.metaKey) { if (event.ctrlKey || event.metaKey) {
this.isCtrlCommandPressed = true; this.isCtrlCommandPressed = true;
} }
}, },
handleKeyUp(event) { handlePointerup(event) {
if (!event.ctrlKey && !event.metaKey) { if (!event.ctrlKey && !event.metaKey) {
this.isCtrlCommandPressed = false; this.isCtrlCommandPressed = false;
} }
},
handleBlur() {
this.isCtrlCommandPressed = false;
} }
} }
}; };

2
resources/assets/sass/pages/components/chat-input.scss vendored
View File

@ -588,6 +588,8 @@
text-align: center; text-align: center;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
user-select: none;
> img { > img {
max-width: 100%; max-width: 100%;
max-height: 100%; max-height: 100%;

2
resources/mobile

@ -1 +1 @@
Subproject commit f697f56342ebce5f41535e4dc3c79de530af4b5e Subproject commit 6f75cd3e8687996031a8497cd6af1f210363827e