dolibarr-fork

Files

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

admin

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

2017-08-23 16:11:51 +02:00

class

Fix: use default $shared value

2017-09-27 17:40:02 +02:00

payment

Fix var not sanitized

2017-05-16 13:27:32 +02:00

stats

Work on 6.0 look and feel