Merge branch 'master' into notes

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 4b2d2ba9e0351ce6d7e2de3ab2ad17fbc1115498..5b5a76e650d15abc1f14bed7fe936864c1102c05 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.1', :require => 'oauth-plugin'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '>= 5.0.9'
+gem 'composite_primary_keys', '>= 5.0.10'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'