Merge branch 'hotfix/0.0.1.1'
don't error out if the root of a reshare of a reshare got deleted, fixes #3546
Merge branch 'hotfix/3546-reshare'
bump version to 0.0.1.2
add simple background for unread messages/conversations mobile
changelog update before release
Merge branch 'release/0.0.2.0'

Conflicts:
	Changelog.md
	config/defaults.yml
Resize deletelabel and ignoreuser images to align them
Update changelog
lets see what travis has to say about the selenium prerelease
let travis find the selenium prerelease
hmm, I hate it if these things work locally...
Revert "hmm, I hate it if these things work locally..."

This reverts commit 4cebe423755d5306d90c042dcc20bc0ba0c63a55.
Allow translation of "suggest member" of Community Spotlight
Add feature contact pod admin
Merge pull request #3792 from movilla/mail_podmin

Add feature contact podmin. Close #3770
Merge pull request #3791 from movilla/suggest_member

Translation "suggest member" of Community Spotlight
the day I decide to switch to seleniums prerelease 2.27 comes out. great. anyway, still two timeouts, any ideas? anyone?
Merge branch 'feature/3779-hide-post-icon-alignment' of https://github.com/Flaburgan/diaspora into Flaburgan-feature/3779-hide-post-icon-alignment
[ci skip]
Conflicts:
	Changelog.md
Remove debugger from the Gemfile.

Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.

Conflicts:
	Gemfile.lock