Maxwell Salzberg c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown ... Conflicts: Gemfile.lock		2011-08-27 14:13:15 -07: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 '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown	2011-08-27 14:13:15 -07:00
vendor	facebox overlay dark again, with a faint spotlight	2011-08-17 22:43:58 -07:00
.gitkeep