Merge pull request #2 from friendica/develop
authorPeter Liebetrau <Ixiter@users.noreply.github.com>
Wed, 30 Jan 2019 12:21:28 +0000 (13:21 +0100)
committerGitHub <noreply@github.com>
Wed, 30 Jan 2019 12:21:28 +0000 (13:21 +0100)
commit9a5f9829c11998284620a804eee15049fccc0757
tree6e1d0476da39493904c9826f69d6813bc709b056
parent431306b02696b44216bb4f2198a055a33ee7c53b
parent8db9b0987eb6b2bf6f46efcb2a523be240246bdf
Merge pull request #2 from friendica/develop

sync with friendica