Commit 4bcd6066 authored by Davis McCarthy's avatar Davis McCarthy
Browse files

Merge branch 'jeffrey-edits' into 'master'

Edits from Jeffrey

See merge request !1
parents f1e61d56 01a23270
Pipeline #7099 passed with stage
in 9 seconds