Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
..
2020-01-04 14:20:25 +01:00
2019-09-23 21:55:30 +02:00
2019-12-18 23:12:31 +01:00
2019-12-18 23:12:31 +01:00
2019-12-18 23:12:31 +01:00
2019-12-18 14:20:36 +00:00
2019-11-05 21:24:41 +01:00
2019-12-18 23:12:31 +01:00
2019-12-18 23:12:31 +01:00
2019-11-05 21:24:41 +01:00
2019-12-18 23:12:31 +01:00
2019-12-18 23:12:31 +01:00