Ferran Marcet 602986ced8 Merge remote-tracking branch 'origin/7.0' into 7.0 ... # Conflicts: # htdocs/comm/propal/class/propal.class.php # htdocs/commande/class/commande.class.php # htdocs/expensereport/class/expensereport.class.php # htdocs/fourn/class/fournisseur.commande.class.php		2018-12-03 12:33:18 +01:00
..
admin	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
class	Merge remote-tracking branch 'origin/7.0' into 7.0	2018-12-03 12:33:18 +01:00
tpl	Update linkedobjectblock.tpl.php	2018-02-12 03:13:12 +01:00
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-03-22 14:19:34 +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