Merge branch 'develop'

This commit is contained in:
Simon Vieille 2022-04-30 12:34:23 +02:00
commit 52be00fc77
3 changed files with 304 additions and 242 deletions

View file

@ -1,10 +1,15 @@
## [Unreleased] ## [Unreleased]
### Added ### Added
* add blocks in default template
### Fixed ### Fixed
### Changed ### Changed
## [1.14.2]
### Added
* add blocks in default template
### Changed
* upgrade murph/murph-core
## [1.14.1] ## [1.14.1]
### Fixed ### Fixed
* fix missing envvar in makefile (npm) * fix missing envvar in makefile (npm)

View file

@ -7,7 +7,7 @@
"prefer-stable": true, "prefer-stable": true,
"require": { "require": {
"php": ">=8.0.0", "php": ">=8.0.0",
"murph/murph-core": "^1.14,>=1.14.0" "murph/murph-core": "^1.14,>=1.14.1"
}, },
"require-dev": { "require-dev": {
"symfony/browser-kit": "^5.4", "symfony/browser-kit": "^5.4",

537
yarn.lock

File diff suppressed because it is too large Load diff