Commit 0f724757 authored by James Lopez's avatar James Lopez

Merge branch 'cherry-pick-2c6ce6ff' into 'master'

Merge branch 'pages-6-1-gitlab-10-5' into 'master'

See merge request gitlab/gitlabhq!2350
parents 5d129709 6276eab9
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment