Commit 3d2e59b8 authored by Max Lyon's avatar Max Lyon
Browse files

Merge branch 'master' into v2beta

Conflicts:
	CI/ci-mac.sh
	VERSION
	src/Unittests/unittests_files.cc
parents cc84b82c b5b9aad9
Pipeline #1695 passed with stage