Changed comment email title
Merge from master
Merge from upstream
Merge from master
Merge from origin
Merge from master
Merge from master
Merge from master
Minor doco.  Add some clarity - that had me scratching my head.
So much so, in fact, that I didn't even notice the typo.
fix blockquote
upload should be first
upload first but not inside another {{if}}
Some documentation of include/config.php.

I hope my guesses are not completely wrong, anyway please take look
not that I tell complete bullshit.
some background work for import/export of things and liked things/profiles
Merge https://github.com/friendica/red into pending_merge
Merge pull request #603 from dawnbreak/docu

Some documentation for include/config.php.
provide backup copy of post for diaspora reshare and re-fetch
Merge https://github.com/friendica/red into pending_merge
more css shifting