Commit 96aa1c64 authored by Amy Blank's avatar Amy Blank

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

release 7.0.0.D

See merge request !308
parents 041b4b3d 23ad4509
Pipeline #14584 passed with stages
in 3 minutes and 17 seconds