maxwell e218ab6780 Merge branch 'master' of github.com:diaspora/diaspora into import ... Conflicts: app/controllers/users_controller.rb		2010-10-13 23:09:48 -07:00
..
user	added another attack vector spec	2010-10-13 18:43:22 -07:00
album_spec.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
aspect_spec.rb	DG MS; added more stuff to importer.	2010-10-13 16:42:27 -07:00
comments_spec.rb	remote comment spec, which passed surprisingly, the comment contains the person	2010-10-12 15:31:54 -07: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	almost all green	2010-10-12 11:17:29 -07:00
photo_spec.rb	almost all green	2010-10-12 11:17:29 -07:00
post_spec.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
profile_spec.rb	Add or later to license notice	2010-10-07 16:25:34 -07:00
request_spec.rb	cleaned request spec	2010-10-08 00:46:24 -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	Add or later to license notice	2010-10-07 16:25:34 -07:00
user_spec.rb	adding spec for password confirmation fail	2010-10-13 16:28:56 -07:00