Skip to content
Commit a7f2dc8c authored by Jan Koniarik's avatar Jan Koniarik
Browse files

Merge branch 'devel' into 'master' 

Devel

See merge request !14
parents c6abab25 3c73d223