Merge origin/master

Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css
This commit is contained in:
clementine.desrucques
2021-12-14 09:07:12 +01:00
parent f293ce8b0f
commit f74104e7ff
5 changed files with 11 additions and 7 deletions

View File

@@ -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>