app/assets/stylesheets/framework/markdown_area.scss · b03141405c40c96bcbdd971ad48a6c432d6bce5f · nexedi / gitlab-ce

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-14 · b0314140

GitLab Bot authored Jun 14, 2018

# Conflicts:
#	app/assets/stylesheets/framework/markdown_area.scss
#	app/assets/stylesheets/pages/merge_requests.scss
#	doc/user/markdown.md

[ci skip]

b0314140

markdown_area.scss 4.47 KB

Replace markdown_area.scss