Merge origin/master
Conflicts: web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
		@@ -6,6 +6,5 @@
 | 
				
			|||||||
  </head>
 | 
					  </head>
 | 
				
			||||||
    <div id="page">
 | 
					    <div id="page">
 | 
				
			||||||
		<div id="entete">
 | 
							<div id="entete">
 | 
				
			||||||
	        <img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" />
 | 
					                    <img src="./images/LogoSDIS29.jpg" id="logo" alt="SDIS29" title="SDIS 29" align='left' style="width: 200px; height: 180px" />	
 | 
				
			||||||
	        <div id="sommaire"></div>
 | 
					<!-- fin de l'ent<6E>te -->
 | 
				
			||||||
<!-- fin affichage du menu -->
 | 
					 | 
				
			||||||
							
								
								
									
										
											BIN
										
									
								
								web/images/LogoSDIS29.jpg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								web/images/LogoSDIS29.jpg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 54 KiB  | 
		Reference in New Issue
	
	Block a user