From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 11 Jan 2017 22:19:59 +0000 (+1100)
Subject: Merge remote-tracking branch 'friendica/develop' into issue/#3062
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b61479ba6eb66a5d23ff997f204319bf934783e0;p=friendica.git

Merge remote-tracking branch 'friendica/develop' into issue/#3062

# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
---

b61479ba6eb66a5d23ff997f204319bf934783e0