Changeset [c13e8a7f3fe426b4868ce66692f3557cfd09c1ce] by Zhang Yuanyi
2010-02-02 16:42:45 UTC
Merge branch 'dev' of git@github.com:Suave/1kg.org into
dev
http://github.com/Suave/1kg.org/commit/c13e8a7f3fe426b4868ce66692f3...
Committed by Zhang Yuanyi
- A public/images/ad/mooncake.jpg
- A public/images/ad/postcard.jpg
- M app/controllers/activities_controller.rb
- M app/controllers/schools_controller.rb
- M app/helpers/application_helper.rb
- M app/models/activity.rb
- M app/views/activities/_form.html.erb
- M app/views/activities/index.html.erb
- M app/views/activities/over.html.erb
- M app/views/comments/_comments.html.erb
- M app/views/schools/moderator.html.erb
- M app/views/shared/_activity.erb
- M lib/tasks/password.rake
- M public/images/ad/festcard09.jpg
- M public/images/ad/kuailebox.jpg
- M public/stylesheets/core.css
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »