6 commits

Author	SHA1	Message	Date
Raphael	fd8028db33	Revert "Revert "Merge remote branch 'upstream/master'"" ... This reverts commit 1481056af2.	2010-10-20 09:51:55 -07:00
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
Sarah Mei	8cf1b83662	cucumber feature closer to passing.	2010-10-19 22:29:07 -07:00
Raphael	eeea57d307	Case sensitivity...	2010-10-18 12:43:04 -07:00
Stephen Caudill	8d17b3537c	Refactor to use a Background	2010-09-26 14:18:58 -04:00
Stephen Caudill	fd69f0201f	User creates an aspect	2010-09-26 12:05:39 -04:00