From: Michael Vogel Date: Tue, 21 Apr 2015 08:13:28 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=261cd441c7d07fca9c1696139ee1135b64d44c53;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications --- 261cd441c7d07fca9c1696139ee1135b64d44c53