guillaume91 6d414ecc81 Merge remote-tracking branch 'origin/master' ... # Conflicts: # laravel_app/public/build/assets/app-a1aeed67.css # laravel_app/public/build/manifest.json		2024-06-20 10:42:22 +02:00
..
assets	Merge remote-tracking branch 'origin/master'	2024-06-20 10:42:22 +02:00
manifest.json	changed the icons in the menu.	2024-06-19 17:09:09 +02:00