Laurent Destailleur ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/compta/facture/card.php htdocs/filefunc.inc.php		2018-09-04 21:35:43 +02:00
..
class	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-04 21:35:43 +02:00
stats	standardize	2018-07-29 17:17:29 +02:00
tpl	trim trailing	2018-07-26 20:19:52 +02:00
card.php	Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm	2018-09-01 14:50:08 +02:00
contact.php	standardize	2018-07-29 17:17:29 +02:00
document.php	comment translation	2018-08-04 14:17:51 +02:00
index.php	standardize	2018-07-29 17:17:29 +02:00
info.php	standardize	2018-07-29 17:17:29 +02:00
list.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
note.php	standardize	2018-07-29 17:17:29 +02:00