Changeset [c7735f93e0a1557c147aa64cbfce28036ac226ad] by Steve Kenworthy

December 5th, 2013 @ 01:35 AM

Merge branch 'devise' of github.com:fatfreecrm/fat_free_crm into devise

Conflicts:
Gemfile.lock app/controllers/passwords_controller.rb app/controllers/registrations_controller.rb app/models/users/user.rb app/views/devise/sessions/new.html.haml config/routes.rb fat_free_crm.gemspec spec/support/auth_macros.rb https://github.com/fatfreecrm/fat_free_crm/commit/c7735f93e0a1557c1...

Committed by Steve Kenworthy

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Ruby on Rails CRM platform for Web 2.0 and beyond