]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ef5838b) | patch
removed conflict solving remains, took from upstream/develop
authorRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 08:14:14 +0000 (09:14 +0100)
committerRoland Häder <roland@mxchange.org>
Thu, 22 Dec 2016 08:14:14 +0000 (09:14 +0100)
commita314dbc56207eff751dbce5c88b055ae8e41ae30
treeb7c55ae53831c0dbd116bb826cfb66b06fef9085tree | snapshot
parentef5838bbd22134ee9ba2180e96b69e8efac2022bcommit | diff
removed conflict solving remains, took from upstream/develop

Signed-off-by: Roland Häder <roland@mxchange.org>
mod/proxy.php diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.