Laurent Destailleur 28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php

2016-10-16 19:04:33 +02:00

..

box_actions.php

…

box_activity.php

…

box_bookmarks.php

…

box_clients.php

…

box_commandes.php

…

box_comptes.php

…

box_contacts.php

…

box_contracts.php

…

box_external_rss.php

…

box_factures_fourn_imp.php

…

box_factures_fourn.php

…

box_factures_imp.php

…

box_factures.php

…

box_ficheinter.php

…

box_fournisseurs.php

…

box_goodcustomers.php

…

box_graph_invoices_permonth.php

…

box_graph_invoices_supplier_permonth.php

…

box_graph_orders_permonth.php

…

box_graph_orders_supplier_permonth.php

…

box_graph_product_distribution.php

…

box_graph_propales_permonth.php

…

box_members.php

…

box_produits_alerte_stock.php

…

box_produits.php

…

box_project.php

…

box_propales.php

…

box_prospect.php

…

box_services_contracts.php

…

box_services_expired.php

…

box_supplier_orders.php

…

box_task.php

…

index.html

…

modules_boxes.php

…