Changeset [3b2be213f2076085642bd31c0c10194bc889eaf6] by Ben Tillman

January 3rd, 2012 @ 12:56 AM

Merge branch 'master' into ransack

Conflicts:

app/assets/javascripts/application.js.erb

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

Committed by Ben Tillman

  • A app/assets/javascripts/application.js.erb
  • A app/assets/stylesheets/application.css.erb
  • R app/assets/javascripts/application.js
  • R app/assets/javascripts/application_tabbed.js
  • R app/assets/stylesheets/application.css
  • M app/models/core/account.rb
  • M app/views/layouts/admin/application.html.haml
  • M app/views/layouts/application.html.haml
  • M config/environments/production.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