Laurent Destailleur f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/install/mysql/migration/5.0.0-6.0.0.sql		2017-09-26 22:11:00 +02:00
..
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-26 22:11:00 +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