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
..
blueprint	added blueprint	2010-06-14 11:50:17 -07:00
brandongrotesque_light	warming up the page. colors were too cold and non-human before.	2010-07-05 00:02:16 -07:00
sass	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
.gitkeep	Activerecord this time\!	2010-06-11 10:40:49 -07:00
application.css	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00
bubble.css	MS; pushing weirdy buble thing	2010-07-28 11:14:27 -07:00
sessions.css	nevermind, nevermind	2010-06-29 23:47:39 -07:00
ui.css	updated button style	2010-08-06 00:15:22 -07:00