Dan Hansen 3ed50cab94 Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged ... Conflicts: app/views/status_messages/bookmarklet.html.haml config/assets.yml db/schema.rb public/javascripts/contact-edit.js public/javascripts/publisher.js public/javascripts/view.js		2011-08-20 14:40:56 -05:00
..
blueprint	optimized images (safes a few bits and makes pagespeed shut the fuck up )	2011-05-31 17:34:22 +02:00
sass	Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged	2011-08-20 14:40:56 -05:00
vendor	facebox overlay dark again, with a faint spotlight	2011-08-17 22:43:58 -07:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00