diff options
author | Saito <saitowu@gmail.com> | 2011-12-29 11:51:33 +0800 |
---|---|---|
committer | Saito <saitowu@gmail.com> | 2011-12-29 11:52:28 +0800 |
commit | a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6 (patch) | |
tree | 753393aee8de4de186679ee672d46beb270f9dbb /Gemfile | |
parent | 6e5caa19856a683e5e9ead5cda907cb4119762d6 (diff) | |
download | gitlab-ce-a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6.tar.gz |
merge charlock_holmes to master
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -22,9 +22,9 @@ gem "acts_as_list" gem "rdiscount" gem "acts-as-taggable-on", "~> 2.1.0" gem "drapper" -gem "rchardet19", "~> 1.3.5" gem "resque" gem "httparty" +gem "charlock_holmes" group :assets do gem "sass-rails", "~> 3.1.0" |