Skip to content
Commit 77c24f1b authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into next-patch-release

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
parents b4765683 b871b4e1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment