Skip to content
Snippets Groups Projects
Commit ef95b9ed authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#72285_minsoc_quelle_url_d_acces_pour_les_fichiers_pdf
parents 8dbf9c50 053a1a59
Branches
Tags
4 merge requests!2660Master,!2625Master,!2624Hotline,!2622dev #72285 keep relative URLS in record link zones
Pipeline #3992 passed with stage
in 39 minutes and 5 seconds
......@@ -140,7 +140,6 @@ class Class_Feature {
$session->features_seen = true;
Class_ScriptLoader::getInstance()
->notify($this->_renderContent($features), false, 10, 'new_features');
}
......
......@@ -253,6 +253,8 @@ class NoticeAjaxControllerItemsCustomIconsTest
$profil->setCfgNotice($config);
$profil->setDefaultSkin($this->mock()
->whenCalled('getCssUrl')
->answers(true)
->whenCalled('getPath')->answers('/skins/customized')
->whenCalled('getTemplatesPath')->answers('/skins/customized/html')
->whenCalled('getImageUrl')
......
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