Commit 06cd3069 authored by Davis McCarthy's avatar Davis McCarthy
Browse files

Merge branch 'jeffrey-edits-2' into 'master'

Jeffrey edits take 2

See merge request !2
parents 4bcd6066 7d69d6aa
Pipeline #7102 passed with stage
in 5 seconds