Raphael 9d71ed1120 Merge remote branch 'robustdj/453-aspect-labels' ... Conflicts: app/models/user.rb pkg/ubuntu/dist		2010-11-02 11:31:51 -07:00
..
album.rb
aspect.rb
comment.rb
contact.rb	REMOVED IMPORTER	2010-11-02 11:17:47 -07:00
person.rb	Person delegates first_name and last_name to profile.	2010-11-01 22:22:15 -07:00
photo.rb	Now expecting a 500 on someone passing an id to create, should really be a 422	2010-11-01 12:31:00 -07:00
post.rb	Now expecting a 500 on someone passing an id to create, should really be a 422	2010-11-01 12:31:00 -07:00
profile.rb	MS IZ everything now uses diaspora handle. this feels so good	2010-11-01 18:42:42 -07:00
request.rb	requests are almost there	2010-11-01 14:54:40 -07:00
retraction.rb	IZ MS retrations for posts now green	2010-11-01 17:11:06 -07:00
service.rb
status_message.rb	Now expecting a 500 on someone passing an id to create, should really be a 422	2010-11-01 12:31:00 -07:00
user.rb	Merge remote branch 'robustdj/453-aspect-labels'	2010-11-02 11:31:51 -07:00