mirror of
https://github.com/diaspora/diaspora.git
synced 2026-04-29 03:01:03 -04:00
This reverts commit8a27568273, reversing changes made to31ef2d60f7. Conflicts: app/helpers/stream_helper.rb app/views/aspects/index.html.haml config/locales/diaspora/en.yml config/routes.rb spec/lib/stream/comments_spec.rb