Commit 934ae38a authored by Brion Vibber's avatar Brion Vibber

Merge branch '1.0.x' into inline-comments

parents 2c03dd56 babdc430
......@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
require_once INSTALLDIR . '/lib/connectsettingsaction.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/**
......@@ -45,7 +44,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
*
* @see SettingsAction
*/
class TwittersettingsAction extends SettingsAction
class TwittersettingsAction extends ProfileSettingsAction
{
/**
* Title of the page
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment