Skip to content
Commit e2f02882 authored by Patrik Čangel's avatar Patrik Čangel
Browse files

Merge branch 'milestone-2' into 'connect-pdf-to-core' 

# Conflicts:
#   module-pdf/src/main/java/cz/muni/fi/pa165/modulepdf/rest/PdfRestController.java
#   pom.xml
parents ceb64e4b 9febe2b0
Pipeline #231402 failed with stages
in 2 minutes and 57 seconds
Expand all Hide whitespace changes
Inline Side-by-side
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