Conflicts: htdocs/comm/action/card.php htdocs/compta/paiement/list.php htdocs/core/class/commonobject.class.php htdocs/mrp/mo_list.php htdocs/projet/tasks/task.php htdocs/public/payment/newpayment.php |
||
|---|---|---|
| .. | ||
| conferenceorbooth.class.php | ||
| conferenceorboothattendee.class.php | ||