Preserve merge type from content-type#932

joshmeranda wants to merge 1 commit intorancher:mainrancher/steve:mainfrom

joshmeranda:respect-content-typejoshmeranda/rancher-steve:respect-content-typeCopy head branch name to clipboard