Changeset [55391ea35ca3b16bd305e2d589c6640f59c423d8] by Nathan Broadbent
January 3rd, 2012 @ 12:30 AM
Merge branch 'master' into chosen
Conflicts:
app/assets/javascripts/application.js.erb
https://github.com/fatfreecrm/fat_free_crm/commit/55391ea35ca3b16bd...
Committed by Nathan Broadbent
- A app/assets/javascripts/application.js.erb
- R app/assets/javascripts/application.js
- R app/assets/javascripts/application_tabbed.js
- M app/views/layouts/admin/application.html.haml
- M app/views/layouts/application.html.haml
- M config/environments/production.rb
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