Changeset [41519e8e293feb1ca370afd2bb2f69091722328b] by Suave Su
2009-09-17 18:44:38 UTC
Merge branch 'light' into dev
Conflicts:
app/views/minisite/lightenschool/dashboard/submit.html.erb
config/routes.rb
http://github.com/Suave/1kg.org/commit/41519e8e293feb1ca370afd2bb2f...
Committed by Suave Su
- A app/helpers/minisite/lightenschool/dashboard_helper.rb
- A app/views/users/_profile_form.html.erb
- M app/controllers/minisite/lightenschool/dashboard_controller.rb
- M app/views/layouts/application.html.erb
- M app/views/minisite/lightenschool/dashboard/index.html.erb
- M app/views/minisite/lightenschool/dashboard/submit.html.erb
- M app/views/users/setting_profile.html.erb
- M config/routes.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 »