Changeset [f7a9cb0ef4569188b7156abe1e5d2fbb62c41879] by Suave Su
2009-10-29 23:59:31 UTC
Merge branch 'bulletin' into dev
Conflicts:
app/controllers/misc_controller.rb
app/views/misc/index.html.erb
http://github.com/Suave/1kg.org/commit/f7a9cb0ef4569188b7156abe1e5d...
Committed by Suave Su
- A app/controllers/admin/bulletins_controller.rb
- A app/controllers/bulletins_controller.rb
- A app/models/bulletin.rb
- A app/views/admin/bulletins/_form.html.erb
- A app/views/admin/bulletins/edit.html.erb
- A app/views/admin/bulletins/index.html.erb
- A app/views/admin/bulletins/new.html.erb
- A app/views/bulletins/index.html.erb
- A app/views/bulletins/show.html.erb
- M app/controllers/misc_controller.rb
- M app/views/admin/shared/_operation_list.erb
- M app/views/misc/index.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 »