* remotes/upstream/master:
Oops - but lets commit the right revision, sorry. There's a spare line in the last one.
Fix darkzero/ns BB icon background colours.
cause of bogus wall-to-wall posts found
add queue totals to admin summary page
DE: update to the strings and some mail templates
fix setting array values to config items
redir links for permission controlled attachments
projects / friendica.git / commit