Laurent Destailleur 57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ...

Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php

2019-06-02 12:36:07 +02:00

..

website.class.php

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

2019-06-02 12:36:07 +02:00

websitepage.class.php

Fix search with alias

2019-02-05 15:23:51 +01:00