Merge branch 'master' into rc

Stephane Bouvryrequested to merge
rc into master

Merge request reports

module/Oscar/src/Oscar/OscarVersion.php

+1 −1
Changes for module/Oscar/src/Oscar/OscarVersion.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ namespace Oscar; 
class OscarVersion

{

    const MAJOR = 2;

    const MINOR = 2;

    const MINOR = 3;

    const PATCH = 1;



    public static function getBuild(){