mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-30 05:11:27 +01:00
Conflicts: htdocs/comm/action/class/api_agendaevents.class.php htdocs/compta/sociales/card.php htdocs/societe/consumption.php
Conflicts: htdocs/comm/action/class/api_agendaevents.class.php htdocs/compta/sociales/card.php htdocs/societe/consumption.php