Conflicts: htdocs/admin/dict.php htdocs/comm/action/class/actioncomm.class.php htdocs/product/card.php htdocs/takepos/receipt.php |
||
|---|---|---|
| .. | ||
| actioncomm.class.php | ||
| actioncommreminder.class.php | ||
| api_agendaevents.class.php | ||
| cactioncomm.class.php | ||
| ical.class.php | ||