Changeset [7730b3c21856165ebfd9d160c124d1f10e221eea] by Nick Quaranto

October 10th, 2008 @ 10:41 AM

Merging some conflicts from nakajima's repo

Committed by Nick Quaranto

  • M app/models/feed.rb
  • M app/models/feeds/blog.rb
  • M app/models/feeds/delicious.rb
  • M app/models/feeds/flickr.rb
  • M app/models/feeds/twitter.rb
  • M config/initializers/feedable.rb
  • M config/initializers/general.rb
  • M lib/core-ext/kernel.rb
  • M lib/core-ext/object.rb
  • M lib/core-ext/string.rb
  • M lib/markup_helper.rb
  • M lib/will_paginate_hacks.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Open source tumblog in Ruby on Rails.

<a href=""></a>