Skip to content

Commit 96705b6

Browse files
riasvdvriasvdv
committed
Merge branch '6.x' into feature/entry-query
2 parents abe5b9e + e49a1d5 commit 96705b6

File tree

1,781 files changed

+20802
-13139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,781 files changed

+20802
-13139
lines changed

‎.lintstagedrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"./vendor/bin/pint --parallel"
88
],
99
"*.scss": ["stylelint --fix --allow-empty-input"],
10-
"*.{html,json,css,scss}": "prettier --ignore-unknown --write"
10+
"!(yii2-adapter)/**/*.{html,json,css,scss}": "prettier --ignore-unknown --write"
1111
}

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"elvanto/litemoji": "~4.3.0",
4646
"enshrined/svg-sanitize": "~0.22.0",
4747
"guzzlehttp/guzzle": "^7.2.0",
48+
"inertiajs/inertia-laravel": "^2.0",
4849
"laravel/framework": "^12.21.0",
4950
"league/uri": "^7.0",
5051
"moneyphp/money": "^4.0",

‎composer.lock‎

Lines changed: 71 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)