diaspora/app/models
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
..
album.rb
blog.rb
bookmark.rb
comment.rb
group.rb DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
person.rb Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 17:31:46 -07:00
photo.rb Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
post.rb Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
profile.rb
request.rb Going toward pending requests 2010-08-09 17:21:41 -07:00
retraction.rb Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
status_message.rb
user.rb Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-09 17:31:46 -07:00