Laurent Destailleur a8f06d78b1 Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/install/pgsql/functions/functions.sql		2016-07-06 14:53:05 +02:00
..
phpexcel	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-07-06 14:53:05 +02:00