Daniel Vincent Grippi 200b0045f7 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-09-13 11:22:05 -07:00
..
application.sass	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 11:22:05 -07:00
sessions.sass	minor textbox css fix	2010-09-08 23:35:07 -07:00
ui.sass	removed some unneeded sass	2010-09-13 11:16:59 -07:00