Changeset [3b6d38ab84dae2050d99ffc10e3bd355b6edebd6] by Ben Tillman

January 6th, 2012 @ 07:49 PM

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

Conflicts:

Gemfile
Gemfile.lock
app/controllers/application_controller.rb
app/controllers/base_controller.rb

https://github.com/fatfreecrm/fat_free_crm/commit/3b6d38ab84dae2050...

Committed by Ben Tillman

  • M app/assets/javascripts/application.js.erb
  • M app/controllers/application_controller.rb
  • M app/controllers/base_controller.rb
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