Laurent Destailleur 259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php		2017-09-08 13:30:54 +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
pdf_soleil.modules.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-08 13:30:54 +02:00