Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 90b68a2..8951587 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.0'
-gem 'devise', '=1.5.2'
+gem 'devise'
+# gem 'devise_token_auth'
 gem 'rest-client'
 gem 'underscore-rails'
 # gem 'backbone-rails'