Skip to content
Snippets Groups Projects
Commit 29333a97 authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

Merge branch 'develop' into 'master' 

merge develop to master

See merge request !20
parents 11eb4052 e783fe74
No related branches found
No related tags found
1 merge request!20merge develop to master
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 1 deletion
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