Laurent Destailleur cce1549f66 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/commande/card.php htdocs/core/lib/functions.lib.php htdocs/fourn/card.php htdocs/public/members/new.php		2017-09-15 11:02:34 +02:00
..
doc	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0	2017-09-15 11:02:34 +02:00
index.html
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
modules_fichinter.php	Scrutinizer Auto-Fixes	2015-03-16 23:21:17 +00:00