Conflicts: htdocs/compta/bank/class/paymentvarious.class.php htdocs/compta/bank/various_payment/card.php htdocs/don/card.php htdocs/langs/en_US/main.lang htdocs/public/payment/newpayment.php test/phpunit/DateLibTzFranceTest.php |
||
|---|---|---|
| .. | ||
| donation_extrafields.php | ||
| donation.php | ||
| index.html | ||