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 /actions/showmessage.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 'actions/showmessage.php')
-rw-r--r-- | actions/showmessage.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/showmessage.php b/actions/showmessage.php index cf3a819c1..db757948b 100644 --- a/actions/showmessage.php +++ b/actions/showmessage.php @@ -137,7 +137,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show local navigation + * Don't show local navigation * * @return void */ @@ -147,7 +147,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show page notice + * Don't show page notice * * @return void */ @@ -157,7 +157,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show aside + * Don't show aside * * @return void */ @@ -167,7 +167,7 @@ class ShowmessageAction extends MailboxAction } /** - * Do not show any instructions + * Don't show any instructions * * @return string */ |