Laurent Destailleur f6d54ca101 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 ... Conflicts: ChangeLog build/exe/doliwamp/doliwamp.iss htdocs/comm/action/index.php htdocs/comm/action/peruser.php		2022-07-28 02:36:57 +02:00
..
doliwamp	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0	2022-07-28 02:36:57 +02:00