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