Conflicts: ChangeLog htdocs/admin/propal.php htdocs/compta/journal/purchasesjournal.php htdocs/compta/journal/sellsjournal.php htdocs/core/class/conf.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/core/modules/mailings/contacts2.modules.php htdocs/langs/ca_ES/admin.lang htdocs/langs/en_US/admin.lang htdocs/langs/es_ES/admin.lang htdocs/langs/fr_FR/admin.lang htdocs/public/demo/index.php |
||
|---|---|---|
| .. | ||
| doctemplates | ||
| lib | ||
| mssql | ||
| mysql | ||
| pgsql | ||
| background.png | ||
| check.php | ||
| default.css | ||
| etape1.php | ||
| etape2.php | ||
| etape4.php | ||
| etape5.php | ||
| fileconf.php | ||
| headbg.jpg | ||
| inc.php | ||
| index.php | ||
| phpinfo.php | ||
| repair.php | ||
| robots.txt | ||
| upgrade2.php | ||
| upgrade.php | ||