danielvincent 85c268b5eb Merge branch 'master' of github.com:diaspora/diaspora		2010-08-24 11:12:04 -07:00
..
controllers	Fix group show controller/view and haml error in nav	2010-08-24 11:11:25 -07:00
helpers	Changed group_nav a little, deleted people_sidebar	2010-08-24 11:02:30 -07:00
models	Changed group_nav a little, deleted people_sidebar	2010-08-24 11:02:30 -07:00
uploaders	Photo filename is now better	2010-08-23 15:10:19 -07:00
views	Merge branch 'master' of github.com:diaspora/diaspora	2010-08-24 11:12:04 -07:00