Laurent Destailleur b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: build/exe/doliwamp/doliwamp.iss htdocs/comm/propal/class/propal.class.php htdocs/contrat/class/contrat.class.php		2013-09-13 09:32:41 +02:00
..
doliwamp	Merge remote-tracking branch 'origin/3.4' into develop	2013-09-13 09:32:41 +02:00