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
..
parser.rb	Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor	2010-08-09 17:31:46 -07:00
webhooks.rb	Changed info logging to debug logging almost everywhere	2010-08-09 14:39:37 -07:00