diaspora/spec/models
Raphael 33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
2010-09-15 17:24:00 -07:00
..
user License notices replaced 2010-09-15 10:58:48 -07:00
album_spec.rb License notices replaced 2010-09-15 10:58:48 -07:00
aspect_spec.rb Using custom registrations controller 2010-09-15 17:05:21 -07:00
comments_spec.rb License notices replaced 2010-09-15 10:58:48 -07:00
person_spec.rb DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
photo_spec.rb License notices replaced 2010-09-15 10:58:48 -07:00
post_spec.rb DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
profile_spec.rb License notices replaced 2010-09-15 10:58:48 -07:00
request_spec.rb Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 17:24:00 -07:00
retraction_spec.rb License notices replaced 2010-09-15 10:58:48 -07:00
status_message_spec.rb License notices replaced 2010-09-15 10:58:48 -07:00
user_spec.rb Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00