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

Merge branch 'master' into 'release-1.6'

Master

See merge request !369
parents 4d63b8e8 93a4976a
No related branches found
No related tags found
1 merge request!369Master
Showing
with 354 additions and 230 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment