Commit 2a6c6288 authored by Todor Kondic's avatar Todor Kondic

Merge branch 'devel' into 'master'

Devel

See merge request !2
parents 5589185a 77a4a5f9
This diff is collapsed.
Markdown is supported
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