Changeset [811483abf916a55da1f5a024c68b9b6a5ad7c48e] by Mike Dvorkin

November 16th, 2009 @ 10:03 PM

Resolved conflicts after merge with lanadv/master
http://github.com/michaeldv/fat_free_crm/commit/811483abf916a55da1f...

Committed by Mike Dvorkin

  • M .gitignore
  • M CHANGELOG
  • M app/models/activity.rb
  • M app/stylesheets/common.sass
  • M app/views/accounts/_account.html.haml
  • M app/views/admin/users/_user.html.haml
  • M app/views/campaigns/_campaign.html.haml
  • M app/views/contacts/_contact.html.haml
  • M app/views/leads/_lead.html.haml
  • M app/views/opportunities/_opportunity.html.haml
  • M app/views/tasks/_assigned.html.haml
  • M app/views/tasks/_completed.html.haml
  • M app/views/tasks/_pending.html.haml
  • M public/stylesheets/common.css
  • M public/stylesheets/screen.css
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