Laurent Destailleur 68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/societe/list.php		2015-10-04 20:57:00 +02:00
..
index.html	WIP PrintIPP	2014-12-05 18:23:54 +01:00
printing.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-10-04 20:57:00 +02:00