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 /scripts/commandline.inc | |
parent | 5efe588174c71979fc1970353c9a556ea441f138 (diff) | |
parent | beae3db41375879e725af053edf8041bbd76ac8c (diff) |
Merge branch '0.9.x' into pluginize-twitter-bridge
Conflicts:
plugins/TwitterBridge/twitterauthorization.php
Diffstat (limited to 'scripts/commandline.inc')
-rw-r--r-- | scripts/commandline.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/commandline.inc b/scripts/commandline.inc index 3b6ef6098..1573b569d 100644 --- a/scripts/commandline.inc +++ b/scripts/commandline.inc @@ -1,7 +1,7 @@ <?php /* - * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, 2009, Control Yourself, Inc. + * StatusNet - a distributed open-source microblogging tool + * Copyright (C) 2008, 2009, StatusNet, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -26,7 +26,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { exit(); } -define('LACONICA', true); +define('STATUSNET', true); // Set various flags so we don't time out on long-running processes |