maxwell 3a8394bd59 Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse		2010-06-21 19:24:07 -07:00
..
blogs	fixed up some views, but some stuff feels like it broke	2010-06-21 16:46:19 -07:00
bookmarks	fixed up some views, but some stuff feels like it broke	2010-06-21 16:46:19 -07:00
dashboard	fixed merge with master	2010-06-21 14:38:38 -07:00
devise	took out filler elements	2010-06-20 11:49:05 -07:00
friends
layouts	Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse	2010-06-21 19:24:07 -07:00
shared	DG MS did some basic work on the dashboard controller and some super basic fallback partial view	2010-06-15 21:08:29 -07:00
status_messages	fixed up some views, but some stuff feels like it broke	2010-06-21 16:46:19 -07:00
users