Skip to content
Commit ec062d44 authored by Ján Repka's avatar Ján Repka
Browse files

Merge branch 'dev' into 'resource-management' 

# Conflicts:
#   Assignment.md
parents 3fda38f6 57d29f99
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment