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

Like stream

Fix Bug 2274, empty tag

modify url invitation facebook

backup task handles postgresql dumps

Try bundler 1.1.rc on travis-ci.org

Let notification dropdown action links float so they don't overlap with the heading. [ci skip]

causes a 500

This reverts commit 805346c7.

re-enable photo viewing on mobile

Fix issue #2173 (oembed overlapping top bar) // CSS approach

Issue #2284: simple fix

Capistrano colorized

comment_stream

remove resque, remove 404 images from bothering thin [ci skip]

add pp and toc for translation

Fix typo + Show diaspora_handle on profile [mobile]

deleted tokens:show:login_with_diaspora_is_comming