Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Tue, 16 Oct 2018 19:01:10 +0000 (21:01 +0200)
committerRalf Thees <ralf@herrthees.de>
Tue, 16 Oct 2018 19:01:10 +0000 (21:01 +0200)
commit2c0c92111f062cef73a878a183465d0faeed1e53
treed13b780196447b2756412d8d866cada0940608f1
parentf303f9edf2dd9943d07e6507006f61ca2abadaa5
parentff643c4b6a72ce4e46c7dc93db1c407491d24514
Merge branch 'develop' of https://github.com/friendica/friendica into develop