Ferran Marcet 602986ced8 Merge remote-tracking branch 'origin/7.0' into 7.0 ... # Conflicts: # htdocs/comm/propal/class/propal.class.php # htdocs/commande/class/commande.class.php # htdocs/expensereport/class/expensereport.class.php # htdocs/fourn/class/fournisseur.commande.class.php		2018-12-03 12:33:18 +01:00
..
api_contracts.class.php	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
contrat.class.php	Merge remote-tracking branch 'origin/7.0' into 7.0	2018-12-03 12:33:18 +01:00
index.html	readd index.html file	2015-02-02 11:13:11 +01:00