Files
dolibarr/htdocs/hrm
Laurent Destailleur 0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
..
2018-02-26 09:20:05 +01:00
2017-10-25 22:02:07 +02:00