]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 623479a df8b522)
Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039...
authorHypolite Petovan <mrpetovan@gmail.com>
Tue, 10 Jan 2017 22:39:38 +0000 (09:39 +1100)
committerHypolite Petovan <mrpetovan@gmail.com>
Tue, 10 Jan 2017 22:39:38 +0000 (09:39 +1100)
# Conflicts:
# view/theme/frio/theme.php

1  2 
view/theme/frio/theme.php patch | diff1 | diff2 | blob | history

diff --cc view/theme/frio/theme.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.