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

Merge branch 'master' into 'release-1.5'

Master

See merge request !346
parents 46650814 24f300b5
No related branches found
No related tags found
Loading
Showing
with 148 additions and 150 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment