Merge branch 'develop'
This commit is contained in:
commit
933e360e26
|
@ -4,6 +4,10 @@
|
||||||
### Fixed
|
### Fixed
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
## [1.13.0]
|
||||||
|
### Changed
|
||||||
|
* upgrade murph/murph-core
|
||||||
|
|
||||||
## [1.12.0]
|
## [1.12.0]
|
||||||
### Changed
|
### Changed
|
||||||
* upgrade murph/murph-core
|
* upgrade murph/murph-core
|
||||||
|
|
1
Makefile
1
Makefile
|
@ -1,7 +1,6 @@
|
||||||
COMPOSER_BIN ?= composer
|
COMPOSER_BIN ?= composer
|
||||||
PHP_BIN ?= php8.1
|
PHP_BIN ?= php8.1
|
||||||
YARN_BIN ?= yarn
|
YARN_BIN ?= yarn
|
||||||
NPM_BIN ?= npm
|
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=8.0.0",
|
"php": ">=8.0.0",
|
||||||
"murph/murph-core": "^1.12,>=1.12.0"
|
"murph/murph-core": "^1.13,>=1.13.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"symfony/browser-kit": "^5.4",
|
"symfony/browser-kit": "^5.4",
|
||||||
|
|
Loading…
Reference in a new issue