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
..
albums	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
aspects	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
comments	various. fixed publisher in new layout.	2010-10-18 11:00:52 -07:00
devise	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
invitations	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
js	Resolve #387	2010-10-19 11:47:43 -07:00
layouts	status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.	2010-10-20 00:02:15 -07:00
people	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
photos	status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.	2010-10-20 00:02:15 -07:00
posts	Add or later to license notice	2010-10-07 16:25:34 -07:00
publics	scratch that last commit	2010-10-05 20:37:28 -07:00
registrations	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
requests	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
shared	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
status_messages	status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.	2010-10-20 00:02:15 -07:00
users	padding on stream fix. added add aspect button in aspect nav.	2010-10-19 12:10:22 -07:00