]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
authorRoland Haeder <roland@mxchange.org>
Wed, 21 Dec 2016 19:01:51 +0000 (20:01 +0100)
committerRoland Haeder <roland@mxchange.org>
Wed, 21 Dec 2016 19:01:51 +0000 (20:01 +0100)
commit0436782e70f496c96f30ee7822865f777ae1d73e
tree11e148b22553dd6d59a194b46c335a0e7c0a3d49
parentbb37cac77281675251f5238e3a7a87a3faf4677c
parent5a72d7527dc26901d15803be04020cba7e0e1965
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

Signed-off-by: Roland Haeder <roland@mxchange.org>
include/like.php
mod/proxy.php