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
..
doc	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	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
mod_arctic.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
mod_pacific.php	Qual: remove PHP closing tag (again)	2014-05-26 13:51:25 +02:00
modules_fichinter.php	Scrutinizer Auto-Fixes	2015-03-16 23:21:17 +00:00