Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/habeascodice/red
missing custom/ description
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/habeascodice/red
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/habeascodice/red
Merge branch 'master' of https://github.com/habeascodice/red
Fix dirsearch with quoted single-word term
Directory shows channel suggestions by default
postgres fixes
update docs
Merge pull request #699 from pafcu/master

Fix dirsearch with quoted single-word term
Merge pull request #701 from habeascodice/master

minor postgres fixes
Merge pull request #702 from pafcu/master

Directory shows channel suggestions by default
Revert "Directory shows channel suggestions by default"
Merge pull request #703 from friendica/revert-702-master

Revert "Directory shows channel suggestions by default"
private mail buttons
blog mode - turn the comment link into a button and group with the likes/dislikes