Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

2014-04-16 09:07:42 +08:00 · 2014-04-16 09:07:42 +08:00 · 30a70bba74
parent f1bbee7e35 53d07645a2
commit 30a70bba74
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@ -1,8 +1,5 @@
 source 'https://rubygems.org'

-gem 'rubyzip'
-gem 'zip-zip'
-gem 'iconv'
 gem "rails", "3.2.13"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"