Raphael 6c0b187d40 Merge remote branch 'jwinky/446-user-name-length-limit' ... Conflicts: app/models/user.rb		2010-11-01 11:00:02 -07:00
..
user	removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)	2010-10-31 12:34:26 -07:00
album_spec.rb
aspect_spec.rb
comment_spec.rb
contact_spec.rb
person_spec.rb
photo_spec.rb
post_spec.rb
profile_spec.rb
request_spec.rb
retraction_spec.rb
status_message_spec.rb
user_spec.rb	Merge remote branch 'jwinky/446-user-name-length-limit'	2010-11-01 11:00:02 -07:00