Commit 3b20db90 authored by Amy Blank's avatar Amy Blank

Merge branch 'release/release-7.0.0' into 'devel'

Spring 2021 release

See merge request !310
parents 96aa1c64 0d2e91ca
Pipeline #14915 passed with stages
in 1 minute and 48 seconds