Commit Graph

57 Commits

Author SHA1 Message Date
Frédéric FRANCE
fa6bc309d6
Merge branch 'develop' into fixphpcs 2019-02-13 15:24:37 +01:00
florian HENRY
5bb260d3d1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit

Conflicts:
	htdocs/product/stock/movement_card.php
2019-02-13 13:52:35 +01:00
florian HENRY
9caefc9483 fix travis 2019-02-13 13:50:57 +01:00
Laurent Destailleur
44fd36b15c Fix phpcs 2019-02-13 12:39:26 +01:00
Laurent Destailleur
ced386fdca Fix phpcs 2019-02-13 11:32:00 +01:00
Frédéric FRANCE
484acc2e00
fix phpcs 2019-02-12 20:55:55 +01:00
wdammak
837821ebb6
Create movement_card.php 2019-01-28 05:12:20 +01:00