Changeset [8926678b9b7ffa57373c5a068ea6f84e9d56fedc] by Zhang Yuanyi
2010-07-01 06:33:28 UTC
fix merge conflict
http://github.com/Suave/1kg.org/commit/8926678b9b7ffa57373c5a068ea6...
Committed by Zhang Yuanyi
- A public/images/co_donations.png
- M app/controllers/co_donations_controller.rb
- M app/controllers/sub_donations_controller.rb
- M app/models/co_donation.rb
- M app/models/sub_donation.rb
- M app/models/user.rb
- M app/views/admin/co_donations/index.html.erb
- M app/views/co_donations/_state.html.erb
- M app/views/co_donations/index.html.erb
- M app/views/co_donations/show.html.erb
- M app/views/comments/_comments.html.erb
- M app/views/shared/_co_donation.html.erb
- M app/views/shared/_sub_donation.html.erb
- M config/sphinx.yml
- M db/schema.rb
- M lib/tasks/misc.rake
- M public/dispatch.fcgi
- M public/stylesheets/core.css
- M vendor/plugins/rails-widgets/lib/widgets/progressbar.css.erb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »