Changeset [c8620b95b2456b1eb2ec4cafbd27c6e54acd87cf] by Suave Su
2010-03-01 10:42:52 UTC
Merge branch 'flow' into dev
Conflicts:
config/routes.rb
http://github.com/Suave/1kg.org/commit/c8620b95b2456b1eb2ec4cafbd27...
Committed by Suave Su
- A app/controllers/requirement_types_controller.rb
- A app/views/admin/requirement_types/_ext_form.html.erb
- A app/views/requirement_types/_form.html.erb
- A app/views/requirement_types/index.html.erb
- A app/views/requirement_types/new.html.erb
- A app/views/requirement_types/show.html.erb
- A app/views/requirements/new.html.erb
- R app/views/admin/requirement_types/_form.html.erb
- M app/controllers/activities_controller.rb
- M app/controllers/admin/requirement_types_controller.rb
- M app/controllers/requirements_controller.rb
- M app/models/requirement.rb
- M app/models/requirement_type.rb
- M app/views/admin/requirement_types/edit.html.erb
- M app/views/admin/requirement_types/index.html.erb
- M app/views/admin/requirement_types/new.html.erb
- M app/views/admin/requirements/index.html.erb
- M app/views/schools/show.html.erb
- M app/views/users/show.html.erb
- M config/routes.rb
- M db/schema.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 »