Laurent Destailleur 2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/bookkeeping/balance.php htdocs/expedition/class/expeditionbatch.class.php htdocs/public/payment/newpayment.php htdocs/stripe/config.php		2018-10-16 18:47:11 +02:00
..
class	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2018-10-09 14:54:18 +02:00
stats	Replace multiple load calls with loadLangs method	2018-10-01 09:22:23 +03:00
tpl	trim trailing	2018-07-26 20:19:52 +02:00
card.php	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-16 18:47:11 +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	Fix consistency of label of proposal status	2018-10-09 14:06:45 +02:00
note.php	standardize	2018-07-29 17:17:29 +02:00