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 /actions/twitapitags.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 'actions/twitapitags.php')
| -rw-r--r-- | actions/twitapitags.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/twitapitags.php b/actions/twitapitags.php index 2bb7ee01a..0bcc55d37 100644 --- a/actions/twitapitags.php +++ b/actions/twitapitags.php @@ -21,7 +21,7 @@ * * @category Twitter * @package StatusNet - * @author Craig Andrews + * @author Craig Andrews <candrews@integralblue.com> * @author Zach Copley <zach@status.net> * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 @@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/twitterapi.php'; * * @category Twitter * @package StatusNet - * @author Craig Andrews + * @author Craig Andrews <candrews@integralblue.com> * @author Zach Copley <zach@status.net> * @copyright 2009 StatusNet, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 |