From a25a85b9396cbc07bf2bfcd12d3c0a6685df66d6 Mon Sep 17 00:00:00 2001 From: Saito Date: Thu, 29 Dec 2011 11:51:33 +0800 Subject: merge charlock_holmes to master --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 3c7b1a4f91f..e240fa65b91 100644 --- a/Gemfile +++ b/Gemfile @@ -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" -- cgit v1.2.3