Conflicts: htdocs/adherents/liste.php htdocs/compta/bank/bankid_fr.php htdocs/holiday/index.php htdocs/opensurvey/list.php |
||
|---|---|---|
| .. | ||
| bonprelevement.class.php | ||
| ligneprelevement.class.php | ||
| rejetprelevement.class.php | ||
Conflicts: htdocs/adherents/liste.php htdocs/compta/bank/bankid_fr.php htdocs/holiday/index.php htdocs/opensurvey/list.php |
||
|---|---|---|
| .. | ||
| bonprelevement.class.php | ||
| ligneprelevement.class.php | ||
| rejetprelevement.class.php | ||