ldestailleur 451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/functions.lib.php htdocs/langs/en_US/cashdesk.lang		2019-01-04 19:36:20 +01:00
..
authority.class.php	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
blockedlog.class.php	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-04 19:36:20 +01:00
index.html	loadlangs	2018-05-27 09:58:23 +02:00