mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-13 04:53:26 +00:00
Fix merge
This commit is contained in:
@@ -394,7 +394,7 @@ class API_V1_adapter extends API_V1_Abstract
|
|||||||
'active' => $app['phraseanet.registry']->get('GV_client_navigator'),
|
'active' => $app['phraseanet.registry']->get('GV_client_navigator'),
|
||||||
),
|
),
|
||||||
'office-plugin' => array(
|
'office-plugin' => array(
|
||||||
'active' => $registry->get('GV_client_navigator'),
|
'active' => $app['phraseanet.registry']->get('GV_client_navigator'),
|
||||||
),
|
),
|
||||||
'homepage' => array(
|
'homepage' => array(
|
||||||
'viewType' => $app['phraseanet.registry']->get('GV_home_publi'),
|
'viewType' => $app['phraseanet.registry']->get('GV_home_publi'),
|
||||||
|
Reference in New Issue
Block a user