]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 003e6a7 bdae456)
Merge branch 'develop' into issue/missing-private-image-src
authorHypolite Petovan <ben.lort@gmail.com>
Sat, 3 Dec 2016 15:34:48 +0000 (10:34 -0500)
committerHypolite Petovan <ben.lort@gmail.com>
Sat, 3 Dec 2016 15:34:48 +0000 (10:34 -0500)
1  2 
include/text.php patch | diff1 | diff2 | blob | history

diff --cc include/text.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.