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

Merge branch 'milestone_2' into 14_component_tests 

# Conflicts:
#	component/src/main/java/cz/muni/pa165/component/App.java
parents 2351d31d b2baa582
No related branches found
No related tags found
2 merge requests!60Docker,!4814 component tests
Hide whitespace changes
Inline Side-by-side
Showing
with 353 additions and 226 deletions
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