Laurent Destailleur 42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php

2021-04-09 14:17:41 +02:00

..

index.html

Protect from dir scan

2019-06-18 14:51:57 +02:00

website.class.php

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-04-09 14:17:41 +02:00

websitepage.class.php

Fix sql error

2021-04-09 01:31:55 +02:00