Commit f811495e authored by James Lopez's avatar James Lopez 🌴
Browse files

Merge branch '10-8-stable-prepare-rc8-fix-conflict-for-18874' into '10-8-stable-prepare-rc8' 

Fixes conflict when picking into prep branch

See merge request gitlab-org/gitlab-ce!18900
parents 3a7d2859 7c3e42f0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment