Merge origin/master

Conflicts: web/WEB-INF/AuthentificationJSP.jsp
2021-10-18 17:20:20 +02:00 · 2021-10-18 17:18:46 +02:00 · 2021-10-18 17:03:37 +02:00
2 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /nbproject/private/
 /build/
 /dist/
--- a/web/WEB-INF/AuthentificationJSP.jsp
+++ b/web/WEB-INF/AuthentificationJSP.jsp
@@ -22,5 +22,6 @@
        </fieldset>
 	</form>
    <br /><br />
 </div>
Author	SHA1	Message	Date
elliass.chelloug	8841819f19	Merge origin/master Conflicts: web/WEB-INF/AuthentificationJSP.jsp	2021-10-18 17:20:20 +02:00
elliass.chelloug	1a8e93244b		2021-10-18 17:18:46 +02:00
elliass.chelloug	18fb6ec354		2021-10-18 17:03:37 +02:00