diff options
author | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-11-10 14:26:49 -0500 |
commit | 7ae10c27b0725a7108b63a788affd4d07e37afdc (patch) | |
tree | 92f952319071ba770136d3e69a82e51040ecb6b5 /lib/noticelist.php | |
parent | 8d5c2b3129a1d7cefd78e311d5cbbe9ab426bb72 (diff) | |
parent | 737fe763471bcb6ebd95c318363308a33e28e889 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
lib/util.php
Diffstat (limited to 'lib/noticelist.php')
-rw-r--r-- | lib/noticelist.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php index 4e5623ded..bf12bb73c 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -347,7 +347,7 @@ class NoticeListItem extends Widget * show the link to the main page for the notice * * Displays a link to the page for a notice, with "relative" time. Tries to - * get remote notice URLs correct, but does not always succeed. + * get remote notice URLs correct, but doesn't always succeed. * * @return void */ @@ -483,7 +483,7 @@ class NoticeListItem extends Widget * show a link to reply to the current notice * * Should either do the reply in the current notice form (if available), or - * link out to the notice-posting form. A little flakey, does not always work. + * link out to the notice-posting form. A little flakey, doesn't always work. * * @return void */ |