public
Description: Uber lightweight Merb blogging engine. Make sure you check out the feather-plugins repo as well!
Clone URL: git://github.com/mleung/feather.git
Click here to lend your support to: feather and make a donation at www.pledgie.com !
fixed conflicts

Merge branch 'master' of git://github.com/thewordnerd/feather into 
thewordnerd/master

Conflicts:

  config/init.rb
  spec/controllers/admin/articles_spec.rb
  spec/models/user_spec.rb
eldiablo (author)
Fri Jul 18 14:14:02 -0700 2008
commit  d9fdcdc6d8770b111dbf9df8835d92c89aeec166
tree    c0776e53a7068c7173dedb53f3e38cb9734e84de
parent  eafb1861bfdc0f92b07282451731d59c3ba7a11d parent  658fab8c25a8670708f811533cca6a7076720f08

Comments

    No one has commented yet.