Laurent Destailleur 7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into ... atm-ph-incoterm Conflicts: htdocs/comm/propal.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php htdocs/install/mysql/migration/3.7.0-3.8.0.sql		2015-03-04 23:03:29 +01:00
..
address.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-02-19 00:01:26 +01:00
client.class.php	Qual: remove PHP closing tag (again)	2014-05-26 13:51:25 +02:00
companybankaccount.class.php	Fixed: Bugs reported by scrutinizer	2014-11-22 16:57:08 +01: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
societe.class.php	Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into	2015-03-04 23:03:29 +01:00