diff options
author | Alex Denisov <1101.debian@gmail.com> | 2012-09-10 10:19:15 +0400 |
---|---|---|
committer | Alex Denisov <1101.debian@gmail.com> | 2012-09-10 10:19:15 +0400 |
commit | 77bfc591bf5836892be26059d92411f9fbf04be9 (patch) | |
tree | 27b334a35a3ed82cf1f99dec237364718cdde878 /Gemfile | |
parent | 85db51f660c4d861c9adf97ed114d4bd4d14ff7d (diff) | |
parent | b565f33472d960e37ed41a8a0c09fbbc3ea65f1e (diff) |
Merge 'master' branch
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -44,7 +44,8 @@ gem "ffaker" gem "seed-fu" # Markdown to HTML -gem "redcarpet", "~> 2.1.1" +gem "redcarpet", "~> 2.1.1" +gem "github-markup", "~> 0.7.4" # Servers gem "thin" |