5 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
maxwell	d0055cee37	changed a bit of text in the invite, also made it show on all aspects now that we have it fixed	2010-10-19 21:07:10 -07:00
maxwell	e8c49feca4	made the public info link in all aspects publisher	2010-10-15 14:10:10 -07:00
maxwell	20f164fd45	fixing some of the invite copy	2010-10-15 11:11:25 -07:00