Merge branch 'master' into openstreetbugs

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 25b10fe7b09c3895944fae03c49849846bc8bc0d..5193881af82a3b155aa93d978fbbbfb959dff66c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -24,14 +24,12 @@ gem 'composite_primary_keys', '>= 5.0.8'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
+gem 'i18n-js', '>= 3.0.0.rc2'
 gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support
 gem 'ruby-openid', '>= 2.2.0'
 
-# Browser detection support
-gem 'browser'
-
 # Markdown formatting support
 gem 'redcarpet'