This reverts commit 8a27568273, reversing changes made to 31ef2d60f7. 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
8a27568273
31ef2d60f7