diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-10 15:37:06 -0700 |
| commit | b1a68e15b760aa2e588680c9e8c7526a7a6d1d13 (patch) | |
| tree | 6100f1aa00f9930433f178173099c0ce67fdc502 /plugins/ClientSideShorten | |
| parent | 7cc58b97feb822ab999b7fefa3a50ce53a7838d5 (diff) | |
| parent | e121d472e7dbb914a85b10bde0a9e2add4d19d11 (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
Diffstat (limited to 'plugins/ClientSideShorten')
| -rw-r--r-- | plugins/ClientSideShorten/ClientSideShortenPlugin.php | 2 | ||||
| -rw-r--r-- | plugins/ClientSideShorten/shorten.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index 454bedb08..3da08e05d 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -22,7 +22,7 @@ * @category Plugin * @package StatusNet * @author Craig Andrews <candrews@integralblue.com> - * @copyright 2009 Craig Andrews http://candrews.integralblue.com + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php index 07c19e2e7..f67cbf3b2 100644 --- a/plugins/ClientSideShorten/shorten.php +++ b/plugins/ClientSideShorten/shorten.php @@ -23,6 +23,7 @@ * @package StatusNet * @author Craig Andrews <candrews@integralblue.com> * @copyright 2008-2009 StatusNet, Inc. + * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ |