Disable invite button after sending invite
added strip_markdown to notification mails
Merge pull request #4251 from 0TWAIN0/feature/4182-render-markdown-in-mails

Feature/4182 render markdown in mails

Conflicts:
	Changelog.md
Merge pull request #4259 from netom/4173-disable-invite-button

Disable invite button after sending invite

Conflicts:
	Changelog.md
Put current user into gon

Fixed bug in app.js, removed unnecessray test
Put preloads into gon.preloads

Fixed tagFollowing not getting into preloads
Merge branch 'netom-4028-gon-current-user' into develop
Changed follow_diasporahq to be configurable to auto follow any user on join.

Fixing example config file

Updated changelog
Merge branch 'Ruxton-feature/autofollow_any_user' into develop
Fix pagination for people list on the tag stream page

Update _index.html.haml

This params broken the pagination of the followers list in tags page
To reproduce try to paginate in
https://joindiaspora.com/tags/diaspora

test for people pagination patch

reducing the per page limit

removing tabs
Merge branch 'fabianfiorotto-patch-1' into develop