diff options
author | Robin Millette <millette@controlyourself.ca> | 2009-04-17 17:04:05 +0000 |
---|---|---|
committer | Robin Millette <millette@controlyourself.ca> | 2009-04-17 17:04:05 +0000 |
commit | e5094c3359fb74caeea474f8e08eb0d15b477652 (patch) | |
tree | 9d60785414e80a5bad75e3e45ab542a0c9f0352b /lib/twitterapi.php | |
parent | 55d7bb4701ca39fb8f4b859b19defdfc7af0142c (diff) | |
parent | 2eb1eb86838b47af7305dbd21a181e63bcd58418 (diff) |
fix merge conflict 0.7.x 0.8.x in util.php and register.php.
Diffstat (limited to 'lib/twitterapi.php')
-rw-r--r-- | lib/twitterapi.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/twitterapi.php b/lib/twitterapi.php index b8357c688..6a90b4e28 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -418,7 +418,7 @@ class TwitterapiAction extends Action function date_twitter($dt) { $t = strtotime($dt); - return date("D M d G:i:s O Y", $t); + return date("D M d H:i:s O Y", $t); } // XXX: Candidate for a general utility method somewhere? |