adrian/metamorphose
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.jean-cloud.net/adrian/metamorphose.git

Browse Source 
Conflicts:
	src/index.html
This commit is contained in:
Elisa 2020-05-12 13:25:47 +02:00
commit 9daea67d7e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/index.html
View File

@ -20,14 +20,25 @@
</section> </section>
<section id="galerie"> <section id="galerie">
<header>
<h2>Écoutez nous</h2>
</header>
</section> </section>
<section id="audio"> <section id="audio">
<header>
<h2>Écoutez nous</h2>
</header>
</section> </section>
<section id="contact"> <section id="contact">
<header> <header>
<<<<<<< HEAD
<h2>Contactez nougfffs</h2> <h2>Contactez nougfffs</h2>
=======
<h2>Contactez nous</h2>
</header>
>>>>>>> master
<form action="http://localhost:8080/submit" method="POST"> <form action="http://localhost:8080/submit" method="POST">
<input type="hidden" name="token" value="s0y6WANzU1XnYERoJxMwekP9pqilSVLK5Gbf3hmZadHB2rQ4u8" /> <input type="hidden" name="token" value="s0y6WANzU1XnYERoJxMwekP9pqilSVLK5Gbf3hmZadHB2rQ4u8" />
<div> <div>