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/OStatus/actions/hostmeta.php | |
| parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
| parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) | |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/OStatus/actions/hostmeta.php')
| -rw-r--r-- | plugins/OStatus/actions/hostmeta.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/OStatus/actions/hostmeta.php b/plugins/OStatus/actions/hostmeta.php index 8ca07f916..db4c913e1 100644 --- a/plugins/OStatus/actions/hostmeta.php +++ b/plugins/OStatus/actions/hostmeta.php @@ -26,7 +26,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } class HostMetaAction extends Action { - function handle() { parent::handle(); |