diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-13 20:25:35 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-13 20:25:35 +0100 |
| commit | 1b8d2e48fadedb8b376a9b1acbe6d199dd8af27e (patch) | |
| tree | ee92e831bf12f0b70f2d9b41a34ffe449c983418 /system/helpers/date_helper.php | |
| parent | f748ebca53568d4832faa15e702e8f0d8123703a (diff) | |
| parent | 3284e376bed538aff3112cd2d6eef70bccb91446 (diff) | |
Fixed conflicts.
Diffstat (limited to 'system/helpers/date_helper.php')
| -rw-r--r-- | system/helpers/date_helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php index 447bf55ac..8c92fdc89 100644 --- a/system/helpers/date_helper.php +++ b/system/helpers/date_helper.php @@ -132,7 +132,7 @@ if ( ! function_exists('standard_date')) 'DATE_COOKIE' => '%l, %d-%M-%y %H:%i:%s UTC', 'DATE_ISO8601' => '%Y-%m-%dT%H:%i:%s%Q', 'DATE_RFC822' => '%D, %d %M %y %H:%i:%s %O', - 'DATE_RFC850' => '%l, %d-%M-%y %H:%m:%i UTC', + 'DATE_RFC850' => '%l, %d-%M-%y %H:%i:%s UTC', 'DATE_RFC1036' => '%D, %d %M %y %H:%i:%s %O', 'DATE_RFC1123' => '%D, %d %M %Y %H:%i:%s %O', 'DATE_RSS' => '%D, %d %M %Y %H:%i:%s %O', |