Merge branch 'milestone-2' into 'oauth'
# Conflicts: # module-core/src/main/java/cz/muni/fi/pa165/modulecore/data/repository/TourRepository.java # module-core/src/main/resources/application.yml # module-email/src/main/java/cz/muni/fi/pa165/moduleemail/api/EmailWithoutRecipientsDto.java # module-email/src/main/java/cz/muni/fi/pa165/moduleemail/rest/EmailRestController.java # module-email/src/main/resources/application.yaml # module-email/src/test/java/cz/muni/fi/pa165/moduleemail/rest/EmailRestControllerTest.java # module-pdf/src/main/java/cz/muni/fi/pa165/modulepdf/rest/PdfRestController.java # module-pdf/src/main/java/cz/muni/fi/pa165/modulepdf/service/CoreService.java # module-pdf/src/test/java/cz/muni/fi/pa165/modulepdf/rest/PdfRestControllerTest.java # module-user/src/main/resources/application.yml # pom.xml
Please register or sign in to comment