Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
thomas.millot 2021-10-18 17:00:27 +02:00
parent 4553efe201
commit a0deb75318

View File

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