mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
reverted r39642 for a better solution to come
This commit is contained in:
parent
ef0cc4f6bd
commit
c900737797
@ -80,22 +80,6 @@ abstract class bo_merge
|
||||
* Parse HTML styles into target document style, if possible
|
||||
*/
|
||||
protected $parse_html_styles = true;
|
||||
|
||||
/**
|
||||
* Apps which currently support merge
|
||||
*
|
||||
* @var array $merge_apps (array appname => human-readable name)
|
||||
*
|
||||
*/
|
||||
public static $merge_apps = array(
|
||||
'addressbook' => 'Addressbook',
|
||||
'calendar' => 'Calendar',
|
||||
'filemanager' => 'Filemanager',
|
||||
'infolog' => 'Infolog',
|
||||
'projectmanager' => 'Projectmanager',
|
||||
'timesheet' => 'Timesheet',
|
||||
'tracker' => 'Tracker',
|
||||
);
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
Loading…
Reference in New Issue
Block a user