Skip to content
Commit 9cb51c6e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'use_redcarpet_for_markdown' of...

Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Conflicts:
	Gemfile
	Gemfile.lock
parents 9c76bd95 c437e2d7
Loading
Loading
Loading