ASWI - Pokročilé softwarové inženýrství » ASWI 2020 » Webová aplikace simulující kontingenční tabulku (CIV) - VLDC

Merge branch 'master' into 'enhancement/7886'

1. Conflicts:
2. src/main/java/vldc/aswi/dao/parameter/ParameterTypeRepository.java
3. src/main/java/vldc/aswi/domain/Assembly.java
4. src/main/java/vldc/aswi/domain/Configuration.java
5. src/main/java/vldc/aswi/domain/EntityParent.java
6. src/main/java/vldc/aswi/domain/Function.java
7. src/main/java/vldc/aswi/domain/Location.java
8. src/main/java/vldc/aswi/domain/Operator.java
9. src/main/java/vldc/aswi/domain/Role.java
10. src/main/java/vldc/aswi/domain/User.java
11. src/main/java/vldc/aswi/domain/parameter/Parameter.java
12. src/main/java/vldc/aswi/domain/parameter/ParameterInConfiguration.java
13. src/main/java/vldc/aswi/domain/parameter/ParameterType.java
14. src/main/java/vldc/aswi/domain/parameter/ParameterValue.java
15. src/main/java/vldc/aswi/web/controller/AssemblyController.java
16. src/main/resources/application.properties