diff options
author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /plugins/ClientSideShorten/shorten.php | |
parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/ClientSideShorten/shorten.php')
-rw-r--r-- | plugins/ClientSideShorten/shorten.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/plugins/ClientSideShorten/shorten.php b/plugins/ClientSideShorten/shorten.php index f67cbf3b2..53c2cf5d1 100644 --- a/plugins/ClientSideShorten/shorten.php +++ b/plugins/ClientSideShorten/shorten.php @@ -41,7 +41,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ShortenAction extends Action { private $text; @@ -66,4 +65,3 @@ class ShortenAction extends Action print $shortened_text; } } - |