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