Laurent Destailleur fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang		2017-08-02 17:56:09 +02:00
..
admin	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-12-03 16:01:18 +01:00
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-07-31 02:39:42 +02:00
card.php	FIX syntax error with pgsql and frequency lost during cron update.	2017-07-26 12:09:15 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	Fix dol_banner	2017-06-12 10:25:28 +02:00
list.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-02 17:56:09 +02:00