1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00

Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #51096 - Remove unnecessary ? for first/last day of
This commit is contained in:
Peter Cowburn
2014-07-31 14:35:13 +01:00
2 changed files with 12508 additions and 12510 deletions
+12506 -12508
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -931,8 +931,8 @@ mssqltime = hour12 ":" minutelz ":" secondlz [:.] [0-9]+ meridian;
isoweekday = year4 "-"? "W" weekofyear "-"? [0-7];
isoweek = year4 "-"? "W" weekofyear;
exif = year4 ":" monthlz ":" daylz " " hour24lz ":" minutelz ":" secondlz;
firstdayof = 'first day of'?;
lastdayof = 'last day of'?;
firstdayof = 'first day of';
lastdayof = 'last day of';
backof = 'back of ' hour24 space? meridian?;
frontof = 'front of ' hour24 space? meridian?;