mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php |
||
|---|---|---|
| .. | ||
| agenda | ||
| cron | ||
| demo | ||
| donations | ||
| emailing | ||
| members | ||
| onlinesign | ||
| opensurvey | ||
| paybox | ||
| payment | ||
| paypal | ||
| stripe | ||
| test | ||
| theme | ||
| websites | ||
| error-401.php | ||
| error-404.php | ||
| index.php | ||
| notice.php | ||