|
|
f0aab96d67
|
Merge remote-tracking branch 'origin/feature/Controller' into feature/Controller
# Conflicts:
# templates/clients/edit.html.twig
# templates/clients/index.html.twig
# templates/commandes/edit.html.twig
# templates/details_commande/index.html.twig
# templates/plats/index.html.twig
# templates/reductions/index.html.twig
# templates/reservations/index.html.twig
|
2024-11-28 15:11:54 +01:00 |
|
