From: Hypolite Petovan Date: Tue, 10 Jan 2017 22:39:38 +0000 (+1100) Subject: Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=30a77cc10a21728efdca48e6cd3cb04586b1df23;p=friendica.git Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme # Conflicts: # view/theme/frio/theme.php --- 30a77cc10a21728efdca48e6cd3cb04586b1df23