From: Michael Vogel Date: Sun, 29 Nov 2015 09:25:44 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=583a2f709b210b556faee4f001bcb58b7a3240e1;p=friendica.git Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design --- 583a2f709b210b556faee4f001bcb58b7a3240e1