Frédéric FRANCE 635306c084 restore original rules to be mergeable without errors

2019-10-26 18:23:51 +02:00

..

index.html

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

2019-06-29 16:46:16 +02:00

linkedobjectblock.tpl.php

restore original rules to be mergeable without errors

2019-10-26 18:23:51 +02:00