Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
elliass.chelloug 2021-10-18 17:22:27 +02:00
parent 8841819f19
commit 5ebec6b026

View File

@ -21,7 +21,7 @@
</p> </p>
</fieldset> </fieldset>
</form> </form>
<br /><br /> <br /><br />
</div> </div>