2
0
forked from Wavyzz/dolibarr
Files
dolibarr-fork/htdocs/user
Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
2017-10-18 19:51:29 +02:00
..
2017-10-07 11:09:31 +00:00
2017-06-10 12:56:28 +02:00
2017-07-15 12:37:31 +02:00
2017-06-10 12:56:28 +02:00
2017-10-13 11:28:26 +00:00
2017-10-07 11:09:31 +00:00
2017-06-10 12:56:28 +02:00
2017-06-16 17:01:43 +02:00