Changeset [3dff805f70d9876a045107c36aea9fef50384bb3] by Steve Kenworthy

December 17th, 2012 @ 10:38 PM

Merge branch 'master' of github.com:fatfreecrm/fat_free_crm

t c04f7760c0fc4ff7488cdd24f06b79185f8796d2.

Conflicts:

app/models/entities/contact.rb

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

Committed by Steve Kenworthy

  • A config/locales/en-US_ransack.yml
  • M app/controllers/comments_controller.rb
  • M config/locales/en-US.yml
  • M config/locales/en-US_fat_free_crm.yml
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