Changeset [d2ca3d862a1e018010ed95bd4974179c77a4787c] by Ben Tillman
December 31st, 2011 @ 04:27 AM
Merge branch 'dry_controllers' into ransack
Conflicts:
app/controllers/accounts_controller.rb
app/controllers/application_controller.rb
app/controllers/campaigns_controller.rb
app/controllers/contacts_controller.rb
app/controllers/leads_controller.rb
app/controllers/opportunities_controller.rb
https://github.com/fatfreecrm/fat_free_crm/commit/d2ca3d862a1e01801...
Committed by Ben Tillman
- A app/controllers/base_controller.rb
- A lib/fat_free_crm/renderers.rb
- M app/controllers/accounts_controller.rb
- M app/controllers/application_controller.rb
- M app/controllers/campaigns_controller.rb
- M app/controllers/comments_controller.rb
- M app/controllers/contacts_controller.rb
- M app/controllers/emails_controller.rb
- M app/controllers/leads_controller.rb
- M app/controllers/opportunities_controller.rb
- M app/controllers/tasks_controller.rb
- M app/controllers/users_controller.rb
- M lib/fat_free_crm.rb
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