Juanjo Menent 05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 ... # Conflicts: # htdocs/core/menus/standard/eldy.lib.php		2015-08-01 14:50:07 +02:00
..
clientfourn.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-08-01 14:50:07 +02:00
index.php	Merge remote-tracking branch 'origin/3.7' into 3.8	2015-08-01 14:50:07 +02:00