Merge branch '1.0.x' into inline-comments
This commit is contained in:
commit
934ae38acd
|
@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once INSTALLDIR . '/lib/connectsettingsaction.php';
|
|
||||||
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
|
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -45,7 +44,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
|
||||||
*
|
*
|
||||||
* @see SettingsAction
|
* @see SettingsAction
|
||||||
*/
|
*/
|
||||||
class TwittersettingsAction extends SettingsAction
|
class TwittersettingsAction extends ProfileSettingsAction
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Title of the page
|
* Title of the page
|
||||||
|
|
Loading…
Reference in New Issue
Block a user