Laurent Destailleur 6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/website.lang		2018-02-15 15:34:17 +01:00
..
admin	Fix modulebuilder	2017-12-09 20:17:47 +01:00
class	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-15 15:34:17 +01:00
tpl	Update linkedobjectblock.tpl.php	2018-02-12 03:13:12 +01:00
card.php	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-12 23:08:23 +01:00
contact.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
document.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
index.php	Fix ref of contract	2017-12-09 20:58:06 +01:00
info.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
list.php	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
note.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
services_list.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-02-14 22:08:18 +01:00