Raphael 456e9e9634 Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots ... Conflicts: app/models/user.rb		2010-08-17 19:34:19 -07:00
..
album.rb
comment.rb	Encryption removed from callbacks, except retractions sort of. verification is in user.receive	2010-08-16 17:23:54 -07:00
group.rb	removed many posts association within group model	2010-08-16 15:51:31 -07:00
person.rb	DG IZ; moved commenting methods into User (from Person).	2010-08-17 13:56:52 -07:00
photo.rb	Took out a couple more references to User.owner	2010-08-16 11:07:18 -07:00
post.rb	minor cleanup in models	2010-08-16 22:44:22 -07:00
profile.rb
request.rb	minor cleanup in models	2010-08-16 22:44:22 -07:00
retraction.rb	minor cleanup in models	2010-08-16 22:44:22 -07:00
status_message.rb
user.rb	Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots	2010-08-17 19:34:19 -07:00