Skip to content
Snippets Groups Projects
Commit c2bea7e8 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Merge branch 'fix' into 'master'

Removing unfixed conflict

See merge request !13
parents 2e5a4644 7f746165
No related branches found
No related tags found
1 merge request!13Removing unfixed conflict
Pipeline #3813 failed