]> git.mxchange.org Git - friendica.git/commit
projects / friendica.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7c34260 875110a)
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Häder <roland@mxchange.org>
Wed, 21 Dec 2016 08:11:58 +0000 (09:11 +0100)
committerRoland Häder <roland@mxchange.org>
Wed, 21 Dec 2016 08:11:58 +0000 (09:11 +0100)
commitb580c238445100e95b2b43343a82d0e5f7a14630
tree93af5d88ea394029ea67703c894d6608d0da71ebtree | snapshot
parent7c342600c388d1cbf7845c05a4aa3ffc0a02f598commit | diff
parent875110ab2749f4fbf4c8d3a0fd2ae1e04b54143fcommit | diff
Merge remote-tracking branch 'upstream/develop' into develop

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