Laurent Destailleur 6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: htdocs/core/menus/standard/eldy.lib.php		2015-07-30 14:54:33 +02:00
..
propal.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2015-07-30 14:54:33 +02:00
propalestats.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00