Changeset [e5c04a7cad069db376212b2b03881d8bb8101cf9] by Steve Kenworthy

December 21st, 2013 @ 01:02 AM

Merge branch 'master' into prototype_to_jquery

Conflicts:
Gemfile.lock app/views/contacts/_section_general.html.haml fat_free_crm.gemspec https://github.com/fatfreecrm/fat_free_crm/commit/e5c04a7cad069db37...

Committed by Steve Kenworthy

  • M .travis.yml
  • M Gemfile
  • M Gemfile.lock
  • M README.md
  • M app/assets/stylesheets/advanced_search.css.scss
  • M app/views/contacts/_section_general.html.haml
  • M config/settings.default.yml
  • M fat_free_crm.gemspec
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