Laurent Destailleur ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php

2015-04-13 13:08:46 +02:00

..

class

Merge remote-tracking branch 'origin/3.7' into develop

2015-04-13 13:08:46 +02:00

export.php

Make module productbatch stable

2015-04-10 11:59:41 +02:00

index.php

Correct

2014-11-25 20:40:00 +01:00