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