Changeset [b7b59b60b93a6448202cc45771515413a55effa1] by Sean Grove
May 12th, 2012 @ 05:51 PM
Merge branch 'cloudfuji' of github.com:fatfreecrm/fat_free_crm into cloudfuji
Conflicts:
Gemfile
Gemfile.lock
https://github.com/fatfreecrm/fat_free_crm/commit/b7b59b60b93a64482...
Committed by Sean Grove
- A vendor/assets/images/chosen-sprite.png
- A vendor/assets/javascripts/chosen-jquery.js
- A vendor/assets/javascripts/chosen-prototype.js
- A vendor/assets/javascripts/chosen.jquery.coffee
- A vendor/assets/javascripts/chosen.proto.coffee
- A vendor/assets/javascripts/lib/abstract-chosen.coffee
- A vendor/assets/javascripts/lib/select-parser.coffee
- A vendor/assets/stylesheets/chosen.css.sass
- M Gemfile
- M Gemfile.lock
- M config/application.rb
- M db/schema.rb
- M fat_free_crm.gemspec
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