Laurent Destailleur 16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php

2020-05-27 14:28:20 +02:00

..

asset_type.class.php

add new rule

2020-05-21 15:05:19 +02:00

asset.class.php

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

2020-05-27 14:28:20 +02:00