Laurent Destailleur 327d764284 Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr ... into GPCsolutions-dolibarr-php7 Conflicts: .gitignore		2015-11-11 19:03:36 +01:00
..
.gitignore
LICENSE
mistranscriptions.txt
oophp-iban.php
php-iban.php
registry.txt