Raphael 1312728b88 Merge branch 'master' of github.com:diaspora/diaspora ... Conflicts: public/stylesheets/application.css public/stylesheets/sass/application.sass		2010-09-13 11:16:45 -07:00
..
application.html.haml	Merge branch 'master' of github.com:diaspora/diaspora	2010-09-13 11:16:45 -07:00
session_wall.html.haml	cleaned login page resources	2010-09-08 23:30:08 -07:00