Merge origin/master

Conflicts: web/WEB-INF/AuthentificationJSP.jsp
2021-10-18 15:32:53 +02:00
parent ffd7162dde
commit 9c667fbe9a
3 changed files with 5 additions and 6 deletions
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -21,10 +21,10 @@
            </web-module-libraries>
            <web-module-additional-libraries/>
            <source-roots>
-                <root id="src.dir" name="Source Packages"/>
+                <root id="src.dir"/>
            </source-roots>
            <test-roots>
-                <root id="test.src.dir" name="Test Packages"/>
+                <root id="test.src.dir"/>
            </test-roots>
        </data>
    </configuration>