Merge origin/master

Conflicts:
	web/WEB-INF/AuthentificationJSP.jsp
This commit is contained in:
thomas.millot
2021-10-18 17:15:48 +02:00
parent d13cdc2f75
commit 10c95e08ef
11 changed files with 145 additions and 128 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
/nbproject/private/
/build/
/dist/