Skip to content
Commit fce91cfb authored by Oskár Adam Válent's avatar Oskár Adam Válent 👀
Browse files

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
parents 4abfbdb9 0cad19e8
Pipeline #232247 failed with stages
in 34 seconds
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment