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
..
_new_photo.haml	some misc design cleanup. album page toggle pending.	2010-07-27 12:12:25 -07:00
_photo.haml	DG IZ; make photos in stream larger, because they need love too	2010-07-28 17:46:43 -07:00
edit.html.haml	removed references of mine? method in all views	2010-08-08 22:53:23 -07:00
new.html.haml	Added photos, profile editing	2010-07-16 17:26:06 -07:00
show.html.haml	Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top	2010-08-09 15:09:05 -07:00