maxwell 9bd77916a8 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/sass/application.sass		2010-12-02 19:18:21 -08:00
..
application.sass	Merge branch 'master' of github.com:diaspora/diaspora	2010-12-02 19:18:21 -08:00
mobile.sass	small changes to mobile	2010-11-22 01:19:11 -08:00
sessions.sass	Add or later to license notice	2010-10-07 16:25:34 -07:00
ui.sass	aspect#show cleanup. added 3 icons.	2010-11-22 17:03:33 -08:00