Merge branch 'wiki'

Conflicts:
	app/views/layouts/_project_menu.html.haml
This commit is contained in:
Dmitriy Zaporozhets 2012-02-21 20:32:43 +02:00
commit ce8eba8913
22 changed files with 294 additions and 17 deletions

View file

@ -0,0 +1,5 @@
module WikisHelper
def markdown_to_html(text)
RDiscount.new(text).to_html.html_safe
end
end