Skip to content
Permalink
Browse files

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

# Conflicts:
#	source/Core/ShopVersion.php
  • Loading branch information...
PirxDanford committed Oct 29, 2019
2 parents 82cc771 + 61adefd commit 968d908e2b34055e532192a0d863b14521a9ba75
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.1.5';
return '6.1.6';
}
}

0 comments on commit 968d908

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