David Henry c7099ac5b0 Merge branch 'master' of github.com:plataformatec/devise into make-devise-more-engine-friendly ...

Conflicts:
	.travis.yml
	Gemfile.lock

2014-05-07 00:22:16 +01:00

..

devise

Merge branch 'master' of github.com:plataformatec/devise into make-devise-more-engine-friendly

2014-05-07 00:22:16 +01:00

generators

Use port option in default url options for ActionMailer

2014-04-04 19:01:12 -03:00

devise.rb

Clean up the code.

2014-05-06 23:31:59 +01:00