Skip to content
Snippets Groups Projects
Commit 3a40a2f3 authored by Anian Bühler's avatar Anian Bühler
Browse files

Merge branch 'dev2' into 'master' 

update master from dev2

See merge request !9
parents ca2fb95f 61e4487a
No related branches found
No related tags found
1 merge request!9update master from dev2
Hide whitespace changes
Inline Side-by-side
Showing
with 214 additions and 94 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