]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2768d8 7141ce9)
Merge remote-tracking branch 'friendica/develop' into bug/proxy_url_extension
authorHypolite Petovan <mrpetovan@gmail.com>
Tue, 20 Dec 2016 20:29:30 +0000 (15:29 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Tue, 20 Dec 2016 20:29:30 +0000 (15:29 -0500)
# Conflicts:
# include/follow.php


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.