]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit30a77cc10a21728efdca48e6cd3cb04586b1df23
treea496f82f369649b46001446a9734a993dc506ad4tree | snapshot
parent623479a346ee6524e9b32e731651a6db12da330bcommit | diff
parentdf8b522f6b96bc3a631e608ee430555590e91f0ccommit | diff
Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039-theme

# Conflicts:
# view/theme/frio/theme.php
view/theme/frio/theme.php diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.