Raphael 70a22ae839 Merge branch 'master' into HEAD ... Conflicts: app/models/post.rb app/models/user.rb config/initializers/socket.rb		2010-09-24 09:15:10 -07:00
..
album.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
aspect.rb	DG IZ; mass-assignment quick-fix in controllers	2010-09-20 11:30:27 -07:00
comment.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
person.rb	Merge branch 'master' into HEAD	2010-09-24 09:15:10 -07:00
photo.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
post.rb	Merge branch 'master' into HEAD	2010-09-24 09:15:10 -07:00
profile.rb	Replace require_relative with compatible version	2010-09-16 14:50:30 +09:00
request.rb	Merge branch 'master' into HEAD	2010-09-24 09:15:10 -07:00
retraction.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
status_message.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
user.rb	Merge branch 'master' into HEAD	2010-09-24 09:15:10 -07:00