Raphael 701bec670f Merge branch 'master' of github.com:diaspora/diaspora into pivots ... Conflicts: app/views/groups/index.html.haml config/deploy_config.yml		2010-08-18 20:50:28 -07:00
..
_new_group.haml	DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken	2010-08-10 17:59:22 -07:00
edit.html.haml	DG RS; added groups. can't delete, but can make new ones	2010-08-09 15:58:53 -07:00
index.html.haml	Merge branch 'master' of github.com:diaspora/diaspora into pivots	2010-08-18 20:50:28 -07:00
new.html.haml	DG RS; added groups. can't delete, but can make new ones	2010-08-09 15:58:53 -07:00
show.html.haml	DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial	2010-08-18 10:53:43 -07:00