Skip to content
Unverified Commit 2714fad1 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into collected-small-changes

# Conflicts:
#	doc/src/Build_development.rst
parents a569027a 164bf1b6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment