Merge branch 'release/1.0.0'

modif
2024-09-16 15:26:08 +02:00 · 2024-09-16 15:23:31 +02:00
1 changed files with 1 additions and 0 deletions
--- a/index.html
+++ b/index.html
@ -9,6 +9,7 @@
 <<<<<<< HEAD
 <footer>
 <p>&copy; 2024 - Entreprise</p>
+<p> modif </p>
 </footer>
 =======
 <header>
Author	SHA1	Message	Date
bayardk	21f9912af8	Merge branch 'release/1.0.0'	2024-09-16 15:26:08 +02:00
bayardk	d2a3bcb8d8	modif	2024-09-16 15:23:31 +02:00