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
Pipeline #114104 passed with stages
in 15 minutes and 33 seconds
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