diff options
| author | Evan Prodromou <evan@status.net> | 2010-02-21 22:35:04 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-02-21 22:35:04 -0500 |
| commit | a0b64663be096ef0e2e1a9abd98a2dd45aa6657e (patch) | |
| tree | 52bd22e7d8fb706e5320a4770b5d51e3bfa35484 /plugins/OStatus/OStatusPlugin.php | |
| parent | bd21f48ceed83699ca4c4613805b1edc1bf49f8c (diff) | |
| parent | 892cd801d18ffa31081e23b5f01d3f79d1a365aa (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/OStatusPlugin.php')
| -rw-r--r-- | plugins/OStatus/OStatusPlugin.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index fdc07b813..ec6f3f3b0 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -58,8 +58,6 @@ class OStatusPlugin extends Plugin $m->connect('main/push/callback/:feed', array('action' => 'pushcallback'), array('feed' => '[0-9]+')); - $m->connect('settings/feedsub', - array('action' => 'feedsubsettings')); // Salmon endpoint $m->connect('main/salmon/user/:id', |