Skip to content
Commit 817e1f95 authored by Tomáš Marek's avatar Tomáš Marek
Browse files

Merge branch '15_milestone_2_by_tomas' into 'milestone_2' 

15 milestone 2 by tomas

See merge request !39
parents c39085e3 2e5a0930
Pipeline #214359 passed with stages
in 3 minutes and 11 seconds
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