From: Michael <heluecht@pirati.ca>
Date: Sun, 12 Mar 2017 21:03:44 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into 1702-only-worker
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=77e8c44016a5c327e61e93724b8921cfd600b66c;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1702-only-worker

Conflicts:
	include/onepoll.php
	include/queue.php
---

77e8c44016a5c327e61e93724b8921cfd600b66c