]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/develop' into develop
authorRoland Haeder <roland@mxchange.org>
Fri, 23 Dec 2016 17:57:41 +0000 (18:57 +0100)
committerRoland Haeder <roland@mxchange.org>
Fri, 23 Dec 2016 17:57:41 +0000 (18:57 +0100)
commit17858bd8443e0384602b71478fd0b1a00cfeafb1
tree5519e5f4ec6b939a5576b7c0b82ced5d286f5225
parent7c8e834546823eeadc68a2451b871addda38af57
parentca734f168caaa3a9fb66fd7ada6ecc26e1299ae6
Merge remote-tracking branch 'upstream/develop' into develop

Signed-off-by: Roland Haeder <roland@mxchange.org>