maxwell 9bd77916a8 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/sass/application.sass		2010-12-02 19:18:21 -08:00
..
blueprint	After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png	2010-10-07 14:59:13 +02:00
sass	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-02 19:18:21 -08:00
vendor	small changes to mobile	2010-11-22 01:19:11 -08:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00
mobile.css	small changes to mobile	2010-11-22 01:19:11 -08:00