diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-09-08 16:02:57 -0700 |
| commit | 9d87313eaebe8240393ac300a435f3b1332c8849 (patch) | |
| tree | 6b7e7d69c63fc6801ad95477be9c11ccb7cd0a1a /actions/shownotice.php | |
| parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
| parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) | |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'actions/shownotice.php')
| -rw-r--r-- | actions/shownotice.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/actions/shownotice.php b/actions/shownotice.php index 82031d90d..41408c23c 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -1,6 +1,6 @@ <?php /** - * Laconica, the distributed open-source microblogging tool + * StatusNet, the distributed open-source microblogging tool * * Show a single notice * @@ -20,14 +20,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * * @category Personal - * @package Laconica - * @author Evan Prodromou <evan@controlyourself.ca> - * @copyright 2008-2009 Control Yourself, Inc. + * @package StatusNet + * @author Evan Prodromou <evan@status.net> + * @copyright 2008-2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -39,10 +39,10 @@ require_once INSTALLDIR.'/lib/feedlist.php'; * Show a single notice * * @category Personal - * @package Laconica - * @author Evan Prodromou <evan@controlyourself.ca> + * @package StatusNet + * @author Evan Prodromou <evan@status.net> * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://laconi.ca/ + * @link http://status.net/ */ class ShownoticeAction extends OwnerDesignAction |