]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'friendica/develop' into issue/#3062
authorHypolite Petovan <mrpetovan@gmail.com>
Wed, 11 Jan 2017 22:19:59 +0000 (09:19 +1100)
committerHypolite Petovan <mrpetovan@gmail.com>
Wed, 11 Jan 2017 22:19:59 +0000 (09:19 +1100)
# Conflicts:
# view/theme/duepuntozero/theme.php
# view/theme/smoothly/theme.php

1  2 
boot.php
mod/photos.php
view/theme/duepuntozero/theme.php
view/theme/smoothly/theme.php
view/theme/vier/theme.php

diff --cc boot.php
Simple merge
diff --cc mod/photos.php
Simple merge
Simple merge
Simple merge
Simple merge