Merge branch 'Moulins_Jeunesse' of git.afi-sa.fr:afi/opacce into Moulins_Jeunesse

Conflicts: library/Class/Systeme/ModulesAccueil/DomainBrowser.php

Merge branch 'Moulins_Jeunesse' of git.afi-sa.fr:afi/opacce into Moulins_Jeunesse
Conflicts: library/Class/Systeme/ModulesAccueil/DomainBrowser.php
8f59014a · efalcy · 7765dcde · e484f347 · 8f59014a
Commit 8f59014a authored 11 years ago by efalcy
--- a/library/Class/Systeme/ModulesAccueil/DomainBrowser.php
+++ b/library/Class/Systeme/ModulesAccueil/DomainBrowser.php
@@ -30,6 +30,7 @@ class Class_Systeme_ModulesAccueil_DomainBrowser extends Class_Systeme_ModulesAc

 	protected $_popupWidth = 600;

+
 	protected $_popupHeight = 700;

 	protected $_defaultValues = ['titre' => 'Domaines',