diff options
author | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
---|---|---|
committer | Sean Murphy <sgmurphy@gmail.com> | 2009-02-07 11:02:10 -0500 |
commit | a3d5e00f64b3c166e34a8d36fcb4f5b757394e9b (patch) | |
tree | 91576e428997bc6cc826fa2cead37794961de23c /lib/mail.php | |
parent | d90089314944ed1696f66cabbb6935ea61e4b2e6 (diff) | |
parent | 08db50b24eaf9e6e5f651448c394f1f50dd2409b (diff) |
Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts:
actions/showstream.php
Diffstat (limited to 'lib/mail.php')
-rw-r--r-- | lib/mail.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mail.php b/lib/mail.php index b424d579f..a1faefc80 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -246,7 +246,7 @@ function mail_subscribe_notify_profile($listenee, $other) "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n". "----\n". "Change your email address or ". - "notification options at ".'%8$s\n'), + "notification options at ".'%8$s' ."\n"), $long_name, common_config('site', 'name'), $other->profileurl, |