]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b221d2 7141ce9)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Haeder <roland@mxchange.org>
Tue, 20 Dec 2016 18:33:40 +0000 (19:33 +0100)
committerRoland Haeder <roland@mxchange.org>
Tue, 20 Dec 2016 18:33:40 +0000 (19:33 +0100)
1  2 
mod/proxy.php patch | diff1 | diff2 | blob | history

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