Laurent Destailleur 00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php

2016-06-22 20:22:22 +02:00

..

zip

Normalized EOL

2013-07-01 12:00:42 +02:00

odf.php

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

2016-06-22 20:22:22 +02:00

Segment.php

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

2016-06-22 20:22:22 +02:00

SegmentIterator.php

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

2016-06-22 20:22:22 +02:00