Skip to content
Snippets Groups Projects
Commit de0a55d2 authored by Todor Kondic's avatar Todor Kondic
Browse files

Merge branch 'master' into 'devel' 

Master

See merge request !1
parents 7b239460 5589185a
No related branches found
No related tags found
3 merge requests!3Devel,!2Devel,!1Master
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 42 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