dolibarr/htdocs/hrm
Laurent Destailleur 7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
..
admin clean and update code 2018-06-21 15:01:45 +02:00
class Work on module builder 2017-10-25 22:02:07 +02:00
establishment loadlangs 2018-05-26 21:11:25 +02:00
index.html
index.php Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-02 12:16:51 +02:00