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
..
blueprint	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
brandongrotesque_light	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
sass	Revert "Merge remote branch 'upstream/master'"	2010-10-20 14:59:55 +02:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00
fileuploader.css	Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc.	2010-10-06 04:59:46 +08:00
loading.gif	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00