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/SubMirror/actions/addmirror.php | |
| parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
| parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) | |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/SubMirror/actions/addmirror.php')
| -rw-r--r-- | plugins/SubMirror/actions/addmirror.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/plugins/SubMirror/actions/addmirror.php b/plugins/SubMirror/actions/addmirror.php index 5acdf1dfe..8c3a9740f 100644 --- a/plugins/SubMirror/actions/addmirror.php +++ b/plugins/SubMirror/actions/addmirror.php @@ -45,7 +45,6 @@ if (!defined('STATUSNET')) { * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 * @link http://status.net/ */ - class AddMirrorAction extends BaseMirrorAction { var $feedurl; @@ -57,7 +56,6 @@ class AddMirrorAction extends BaseMirrorAction * * @return boolean success flag */ - function prepare($args) { parent::prepare($args); |