Merge branch 'develop' into pr/advanced-mailer

This commit is contained in:
Kijin Sung 2016-05-10 14:00:26 +09:00
commit b971ea19ca
34 changed files with 798 additions and 108 deletions

View file

@ -99,6 +99,15 @@ return array(
'display_to' => 'admin',
'allow' => array(),
),
'seo' => array(
'main_title' => '',
'subpage_title' => '',
'document_title' => '',
'og_enabled' => false,
'og_extract_description' => false,
'og_extract_images' => false,
'og_use_timestamps' => false,
),
'mediafilter' => array(
'iframe' => array(),
'object' => array(),