resolved user.rb conflict
[rails.git] / public / potlatch /
2007-04-28 Richard Fairhurstbeginnings of Potlatch on Rails