diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-09-02 16:42:15 -0400 |
commit | a535ccdc4eba320ad88dc531329ae63c7f09c258 (patch) | |
tree | a8448dfe0b764818562ca9d04a39f04d4978dead /lib/oauthclient.php | |
parent | f949c2c9d9afa63496f26b33d0309f8d06f77520 (diff) | |
parent | 0c95734a6874608ea5ed44608cabeda7c3a1b4ea (diff) |
Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
lib/common.php
lib/twitter.php
Diffstat (limited to 'lib/oauthclient.php')
-rw-r--r-- | lib/oauthclient.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/oauthclient.php b/lib/oauthclient.php index cc10cea8f..f1827726e 100644 --- a/lib/oauthclient.php +++ b/lib/oauthclient.php @@ -22,7 +22,7 @@ * @category Action * @package StatusNet * @author Zach Copley <zach@status.net> - * @copyright 2008 StatusNet, Inc. + * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ |