maxwell d443be35f9 Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor ... Conflicts: app/controllers/publics_controller.rb app/models/user.rb		2010-08-09 17:31:46 -07:00
..
controllers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 17:31:46 -07:00
helpers	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 17:31:46 -07:00
models	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 17:31:46 -07:00
uploaders	Fixed Photos, and Carrierwave initializer	2010-08-02 21:31:14 -07:00
views	DG RS; added groups. can't delete, but can make new ones	2010-08-09 15:58:53 -07:00