Raphael d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top ... Conflicts: app/views/albums/show.html.haml app/views/authors/show.html.haml app/views/layouts/application.html.haml app/views/photos/show.html.haml		2010-08-09 15:09:05 -07:00
..
application.sass	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
sessions.sass	nevermind, nevermind	2010-06-29 23:47:39 -07:00
ui.sass	updated button style	2010-08-06 00:15:22 -07:00