Raphael 950c6a7cab Merge branch '1.9.2' into HEAD ...

Conflicts:
	app/models/photo.rb

2010-09-24 14:36:00 -07:00

..

user

DG IZ; cleanup

2010-09-22 15:48:50 -07:00

album_spec.rb

Refactor Album spec

2010-09-17 16:41:58 -04:00

aspect_spec.rb

fix spec_helper for 1.9.2

2010-09-24 11:49:30 -07:00

comments_spec.rb

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

person_spec.rb

Delete user.terse_url

2010-09-23 10:24:10 -07:00

photo_spec.rb

Merge branch '1.9.2' into HEAD

2010-09-24 14:36:00 -07:00

post_spec.rb

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

profile_spec.rb

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

request_spec.rb

Merge branch 'master' of github.com:diaspora/diaspora into production

2010-09-15 22:37:05 -07:00

retraction_spec.rb

Spell our own name right

2010-09-15 17:56:18 -07:00

status_message_spec.rb

Cleanup stray whitespace

2010-09-16 10:07:59 +08:00

user_spec.rb

spec cleanup

2010-09-21 20:02:37 -07:00