Merge origin/master
Conflicts: src/java/bdd/PompierMysql.java
This commit is contained in:
parent
30e988a406
commit
0d1d4385f9
@ -32,6 +32,5 @@
|
|||||||
<tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp" size="20" maxlength="30"></td></tr>
|
<tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp" size="20" maxlength="30"></td></tr>
|
||||||
</table>
|
</table>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">
|
<input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
@ -9,7 +9,7 @@ and open the template in the editor.
|
|||||||
*/
|
*/
|
||||||
body
|
body
|
||||||
{
|
{
|
||||||
background-color: #e2e7e9;
|
background-color: #596b6e;
|
||||||
background-repeat: repeat-x;
|
background-repeat: repeat-x;
|
||||||
margin:0% 0%;
|
margin:0% 0%;
|
||||||
padding : 0.9em;
|
padding : 0.9em;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user