Changeset [8aa772aa4a4c43d252250376ebb15ded96e80441] by Nathan Broadbent

November 11th, 2011 @ 02:32 AM

Merge branch 'master' into custom_fields

Conflicts:

Gemfile
Rakefile

https://github.com/fatfreecrm/fat_free_crm/commit/8aa772aa4a4c43d25...

Committed by Nathan Broadbent

  • A db/schema.rb
  • M .gitignore
  • M Gemfile
  • M Rakefile
  • M app/views/layouts/_tabbed.html.haml
  • M config/routes.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