José Valim 6d681c5b8a Merge remote-tracking branch 'heimidal/updates' into reconfirm ... Conflicts: lib/devise/models/confirmable.rb test/support/helpers.rb		2011-12-04 20:58:41 +01:00
..
active_record	change method should be instance method. closes #1345	2011-11-06 16:15:17 +03:00
devise	Merge pull request #1326 from sbounmy/master	2011-11-10 03:27:53 -08:00
mongoid	Invoking the model generator even if the model exists but only when the behavior is :revoke (i.e. we are running 'rails destroy' instead of 'rails generate')	2010-12-18 15:15:42 +08:00
templates	Merge remote-tracking branch 'heimidal/updates' into reconfirm	2011-12-04 20:58:41 +01:00