Merge origin/master
Conflicts: web/WEB-INF/feuilleGardes.jsp web/css/mycss.css
This commit is contained in:
		@@ -31,8 +31,8 @@
 | 
			
		||||
                            <tr>
 | 
			
		||||
                                <c:forEach var="i" begin="0" end="6" step="1">
 | 
			
		||||
                                    <c:forEach items='${sessionScope.lesPeriodes}' var="unePeriode" varStatus="status">
 | 
			
		||||
                                        <c:set var="periode" value="${unePeriode.getCode()}" scope="page"/>
 | 
			
		||||
                                        <td class="text-center">${unePeriode}</td>
 | 
			
		||||
                                        
 | 
			
		||||
                                        <td class="text-center">${unePeriode.getCode()}</td>
 | 
			
		||||
                                    </c:forEach>
 | 
			
		||||
                                </c:forEach>
 | 
			
		||||
                            </tr>
 | 
			
		||||
 
 | 
			
		||||
@@ -32,8 +32,8 @@
 | 
			
		||||
                            <tr>
 | 
			
		||||
                                <c:forEach var="i" begin="0" end="6" step="1">
 | 
			
		||||
                                    <c:forEach items='${sessionScope.lesPeriodes}' var="unePeriode" varStatus="status">
 | 
			
		||||
                                        <c:set var="periode" value="${unePeriode.getCode()}" scope="page"/>
 | 
			
		||||
                                        <td class="text-center">${unePeriode}</td>
 | 
			
		||||
                                       
 | 
			
		||||
                                        <td class="text-center">${unePeriode.getCode()}</td>
 | 
			
		||||
                                    </c:forEach>
 | 
			
		||||
                                </c:forEach>
 | 
			
		||||
                            </tr>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user