ilya 394bf1acb5 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: app/models/user.rb spec/models/user_spec.rb		2010-09-21 16:15:01 -07:00
..
user	DG MS; cleaned up spec	2010-09-21 15:41:29 -07:00
album_spec.rb	Refactor Album spec	2010-09-17 16:41:58 -04:00
aspect_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
comments_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08:00
person_spec.rb	RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG	2010-09-21 15:46:57 -07:00
photo_spec.rb	Cleanup stray whitespace	2010-09-16 10:07:59 +08: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	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-21 16:15:01 -07:00