maxwell 173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" ... This reverts commit c45893d07d. Conflicts: config/locales/diaspora/en.yml		2010-11-22 17:11:34 -08:00
..
devise	translatable status is good again	2010-11-22 22:30:37 +01:00
diaspora	Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"	2010-11-22 17:11:34 -08:00
rails-i18n	Updating rails-i18n	2010-11-21 01:52:59 +01:00