Skip to content

Commit

Permalink
Merge branch 'v4/develop' into v4/main
Browse files Browse the repository at this point in the history
  • Loading branch information
bastianallgeier committed Jun 1, 2023
2 parents 33bad0d + d6ac79f commit 70173e2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Kirby core",
"license": "proprietary",
"type": "kirby-cms",
"version": "4.0.0-alpha.1",
"version": "4.0.0-alpha.2",
"keywords": [
"kirby",
"cms",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php return array(
'root' => array(
'name' => 'getkirby/cms',
'pretty_version' => '4.0.0-alpha.1',
'version' => '4.0.0.0-alpha1',
'pretty_version' => '4.0.0-alpha.2',
'version' => '4.0.0.0-alpha2',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand Down Expand Up @@ -38,8 +38,8 @@
'dev_requirement' => false,
),
'getkirby/cms' => array(
'pretty_version' => '4.0.0-alpha.1',
'version' => '4.0.0.0-alpha1',
'pretty_version' => '4.0.0-alpha.2',
'version' => '4.0.0.0-alpha2',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand Down

0 comments on commit 70173e2

Please sign in to comment.