nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
diaspora/spec/models
History
Alec Leamas 1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
..
user Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
album_spec.rb Add or later to license notice 2010-10-07 16:25:34 -07:00
aspect_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
comments_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
fb_status_spec.rb stop the file include madness. using File.join and Rails.root for includes everywhere I could 2010-10-10 11:54:08 -07:00
person_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
photo_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
post_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
profile_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
request_spec.rb the invitations add requests which are now correctly auto accepted 2010-10-15 17:20:04 -07:00
retraction_spec.rb killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
status_message_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00
user_spec.rb Revert "Merge remote branch 'upstream/master'" 2010-10-20 14:59:55 +02:00