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
..
_group_nav.haml	javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing	2010-08-02 17:27:45 -07:00
_post_wrapper.haml	removed references of mine? method in all views	2010-08-08 22:53:23 -07:00
_publisher.haml	MS added rails 3rc	2010-07-29 09:59:03 -07:00