Changeset [36ce53089a52034cffef45894b6e2cb9ebcb9c6e] by Doug Youch
February 24th, 2010 @ 10:57 AM
Merge branch 'master' of git://github.com/cykod/Webiva into mailing-steps
Conflicts:
config/environments/development.rb
https://github.com/cykod/Webiva/commit/36ce53089a52034cffef45894b6e...
Committed by Doug Youch
- M app/controllers/application_controller.rb
- M app/controllers/editor/auth_feature.rb
- M app/controllers/editor/auth_renderer.rb
- M app/models/content/core_publication/view_publication.rb
- M app/models/content_node.rb
- M app/views/file/_file_javascript.rhtml
- M vendor/modules/feed/app/models/feed/content_node_rss_handler.rb
- M vendor/modules/feed/app/views/feed/admin/rss.rhtml
- M vendor/modules/feedback/app/controllers/feedback/pingback_controller.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 ยป