Skip to content
Permalink
Browse files

Merge branch 'b-6.1.x' into b-6.x

# Conflicts:
#	source/Core/ShopVersion.php
  • Loading branch information...
PirxDanford committed Oct 29, 2019
2 parents 4405bb4 + 968d908 commit 9068ca8355ab3e1ce95c726ffa9a63f3e6b3ac5f
Showing with 1 addition and 1 deletion.
  1. +1 −1 source/Core/ShopVersion.php
@@ -16,6 +16,6 @@ class ShopVersion
*/
public static function getVersion()
{
return '6.2.0-beta.1';
return '6.2.0-rc.1';
}
}

0 comments on commit 9068ca8

Please sign in to comment.
You can’t perform that action at this time.