diaspora/app
Pistos aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream"
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
2011-11-30 22:22:32 -05:00
..
controllers Revert "Merge pull request #2428 from geckoxx/comment_stream" 2011-11-30 22:22:32 -05:00
helpers Revert "Merge pull request #2428 from geckoxx/comment_stream" 2011-11-30 22:22:32 -05:00
mailers adding attachments to all recepients 2011-10-31 18:09:43 -07:00
models Revert "Merge pull request #2428 from geckoxx/comment_stream" 2011-11-30 22:22:32 -05:00
uploaders MS DG update copyright 2011-09-14 11:23:12 -07:00
views Revert "Merge pull request #2428 from geckoxx/comment_stream" 2011-11-30 22:22:32 -05:00