Commit 50cc187c authored by Nathan Peraldi's avatar Nathan Peraldi

Merge branch 'master' into...

Merge branch 'master' into 12-formulaire-adhesion-individu-pointer-vers-la-page-adullact-de-helloasso

# Conflicts:
#	contact.php
parents d90c67cc 31fce764
......@@ -129,7 +129,6 @@ get_header();
for ($a = 0; $a < count($liste); $a++) {
$mot = $liste[$a][0];
if (!isWordIn($mot, $listeTempo)) {
$listeTempo[] = $mot;
}
......@@ -181,6 +180,7 @@ get_header();
for ($a = 0; $a < count($liste); $a++) {
$mot = createNameClass($liste[$a][0]);
if (!isWordIn($mot, $resultList)) {
$resultList[] = $mot;
}
......@@ -269,12 +269,10 @@ get_header();
<?php tryToShowError("first selection"); ?>
</p>
<div id="link">
<a href="contact.php" id="linkRedirection" title="Page par défaut">Valider</a>
<a href="contact.php" id="linkRedirection">Texte</a>
</div>
<div id="link">
<a href="contact.php" id="linkRedirection">Texte</a>
</div>
<div id="formulaireEPCIMutualisant">
<label for="nombreHabitantsEPCI">Nombre d'habitants de l'EPCI :</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment