Use uniform abbreviations for CC licenses

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 3f16358ed1c24c150dc64d5a3eb8b577e2c2497f..c1ca5fa353bf3ea8a3623e8a3bfebb667949aceb 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -41,12 +41,12 @@ gem 'ejs'
 gem 'rails-i18n', ">= 0.6.3"
 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
-gem 'openstreetmap-oauth-plugin', '>= 0.4.1.1', :require => 'oauth-plugin'
+gem 'oauth-plugin', '>= 0.5.1'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'composite_primary_keys', '>= 6.0.0'
-gem 'http_accept_language', '~> 1.0.2'
-gem 'paperclip', '~> 2.0'
+gem 'http_accept_language', '~> 2.0.0'
+gem 'paperclip', '~> 3.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'
 gem 'rack-cors'