Skip to content
Snippets Groups Projects
Commit 41326e46 authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'master' into dev

parents f5c4133d 3f8a7414
Branches
Tags
6 merge requests!81New stable release,!43Merge dev to master,!23Sprint results,!20Pull Request,!19Pull Request,!18Merge Conflicts
Showing
with 351 additions and 132 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment