mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-03 07:32:32 +01:00
Conflicts: .travis.yml htdocs/admin/company.php htdocs/compta/tva/document.php htdocs/core/lib/files.lib.php htdocs/main.inc.php
Conflicts: .travis.yml htdocs/admin/company.php htdocs/compta/tva/document.php htdocs/core/lib/files.lib.php htdocs/main.inc.php