fix lock permissions view and autoload not kicking in on touch devices under certain conditions
forgot to change one line
Well, if you want to add a color picker it is indeed a good idea

to include the color picker.
Merge pull request #379 from cvogeley/master

Well, if you want to add a color picker it is indeed a good idea
Merge pull request #377 from beardy-unixer/master

Fix wall photo uploads.
ensure wall_upload always has width and height if the image is valid
missed one
Merge https://github.com/friendica/red into zpull
This should be a slight improvement in setting ciphers - we'll punt on RedHat but open up the list just for openssl distros which seem to have all the problems at the moment.
webfinger enhancements: per RFC7033
improve scannability of content with per-item bottom border, but lighten the per-item borders considerably so it isn't in your face. This is an experiment based on sound principles, but I'm not a UI expert. If this uglifies it too much - please revert.
Spare / and an undeclared var in editwebpage.
allow zotfeed to create a firehose of a site.
add admin/channels
Merge https://github.com/friendica/red into zpull
more work on firehose
there's the problem
let's limit this to two weeks so it doesn't pound servers and waste too much space
need include
firehose testing (network?f=&fh=1) - some possible security bugs so testing purposes only