# Conflicts: # backend/controllers/CommandeController.php # backend/web/js/lechatdesnoisettes.js # common/models/Commande.php # producer/controllers/CommandeController.php # producer/views/commande/_form.php # producer/views/order/history.php