Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

2010-02-21 22:35:04 -05:00
parent bd21f48cee 892cd801d1
commit a0b64663be
2 changed files with 0 additions and 232 deletions
--- 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',