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
..
admin Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
class Work on module builder 2017-10-25 22:02:07 +02:00
establishment Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
index.html Add admin & first version to manage establishment 2015-10-10 06:39:59 +02:00
index.php Better management of hidden option HOLIDAY_HIDE_BALANCE 2018-03-19 15:13:36 +01:00