OSDN Git Service

Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitla...
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 20 Apr 2012 22:44:15 +0000 (01:44 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fri, 20 Apr 2012 22:44:15 +0000 (01:44 +0300)
commit9cb51c6ea29660bfd3cca8fd4e64090cf2d5ac6e
treeb49dcab12fb154963a54addd41728465c38ba29e
parent9c76bd95402dfb4fa49cca4876c9714f408c5122
parentc437e2d7d416dae73efdea248a34b452d912986e
Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Conflicts:
Gemfile
Gemfile.lock
Gemfile
Gemfile.lock