Skip to content
Commit d1c5c1d8 authored by Milan Mozolák's avatar Milan Mozolák
Browse files

Merge remote-tracking branch 'origin/main' into xmozolak/mission-rest

# Conflicts:
#	backend/secret-archive-api/src/main/java/cz/fi/muni/pa165/seminar4/group7/dto/agent/AgentDTO.java
#	backend/secret-archive-api/src/main/java/cz/fi/muni/pa165/seminar4/group7/dto/agent_assignment/AgentAssignmentDTO.java
#	backend/secret-archive-api/src/main/java/cz/fi/muni/pa165/seminar4/group7/dto/mission/MissionDTO.java
#	backend/secret-archive-app/src/main/resources/data.sql
#	backend/secret-archive-service/src/main/java/cz/fi/muni/pa165/seminar4/group7/BeanMappingService.java
parents a7fa918e be38da67
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