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

Merge branch 'devel' into 'master' 

wololol

See merge request !15
parents a7f2dc8c bbb90bfd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment