Skip to content
Snippets Groups Projects
Commit e3cdfaa2 authored by Tomáš Marek's avatar Tomáš Marek
Browse files

Merge branch 'milestone_2' into 14_component_tests

# Conflicts:
#	race/src/main/java/cz/muni/pa165/race/data/repository/RaceRepository.java
parents 4a6ee5f3 a448f2c7
No related branches found
No related tags found
2 merge requests!60Docker,!4814 component tests
Showing
with 240 additions and 96 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment