Skip to content

Commit 03aa99c

Browse files
MC-18527: Merge release branch into 2.3-develop
- fix merge conflict
1 parent aecacb8 commit 03aa99c

File tree

2 files changed

+151
-59
lines changed

2 files changed

+151
-59
lines changed

composer.lock

Lines changed: 34 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)