Laurent Destailleur 3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php

2019-07-18 18:09:37 +02:00

..

ajax

Merge branch 'develop' into nospaceaftercomma

2019-01-30 18:27:35 +01:00

class

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

2019-07-18 18:09:37 +02:00

commande

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

2019-07-18 18:09:37 +02:00

facture

FIX Nowrap on amount

2019-07-02 12:01:50 +02:00

js

trim trailing

2018-07-26 18:22:16 +02:00

paiement

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

product

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

2019-07-18 18:09:37 +02:00

card.php

translation

2019-03-22 09:44:30 +01:00

contact.php

PSR2 space after comma in function call

2019-01-27 11:55:16 +01:00

index.php

replace html by html5 in fourn

2019-03-07 20:46:38 +01:00

recap-fourn.php

replace html by html5 in fourn

2019-03-07 20:46:38 +01:00