Conflicts: .travis.yml htdocs/admin/company.php htdocs/compta/tva/document.php htdocs/core/lib/files.lib.php htdocs/main.inc.php |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| document.php | ||
| index.php | ||
| info.php | ||
| list.php | ||
| quadri_detail.php | ||
Conflicts: .travis.yml htdocs/admin/company.php htdocs/compta/tva/document.php htdocs/core/lib/files.lib.php htdocs/main.inc.php |
||
|---|---|---|
| .. | ||
| class | ||
| card.php | ||
| clients.php | ||
| document.php | ||
| index.php | ||
| info.php | ||
| list.php | ||
| quadri_detail.php | ||