diaspora/spec/models
Daniel Vincent Grippi c1a9a89be7 Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
	app/models/user.rb
	config/deploy.rb
	spec/factories.rb
	spec/models/request_spec.rb
	spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
..
user Albums_by_aspect now takes :all 2010-09-13 17:32:29 -07:00
album_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
aspect_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
comments_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
person_spec.rb Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
photo_spec.rb Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 14:26:15 -07:00
post_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
profile_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
request_spec.rb Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00
retraction_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
status_message_spec.rb added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
user_spec.rb Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-14 11:08:18 -07:00