Skip to content
Commit 5752c41b authored by Tomáš Janoušek's avatar Tomáš Janoušek
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request !12
parents 895c8377 680cbfd9
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