Commit 6fc03c74 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'master' into creed

parents c18064c1 eabe9440
Loading
Loading
Loading
Loading
+1 −1
Changes for config/autoload/global.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ return array(

            // Jeudi de l'assension
            $ascension = new DateTime(date('Y-m-d', $easterDate));
            $ascension->add(new DateInterval('P40D'));
            $ascension->add(new DateInterval('P39D'));
            $feries[$ascension->format('n')][$ascension->format('Y-n-j')] = "Jour ferié (Jeudi de l'ascension)";

            // Pentecôte