Merge origin/master
Conflicts: web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
parent
8841819f19
commit
5ebec6b026
@ -21,7 +21,7 @@
|
||||
</p>
|
||||
</fieldset>
|
||||
</form>
|
||||
<br /><br />
|
||||
<br /><br />
|
||||
|
||||
</div>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user