Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorRalf Thees <ralf@herrthees.de>
Thu, 18 Oct 2018 08:42:10 +0000 (10:42 +0200)
committerRalf Thees <ralf@herrthees.de>
Thu, 18 Oct 2018 08:42:10 +0000 (10:42 +0200)
commitfdac992b6b7151c8f6e5052f6f293459cdd2dea9
tree90b82a3be0be31daf5731bec3f9b0bbc28073e34
parent5201e9009dbabae9b598a3ee5399ff228696fe0e
parente2f005f68cc109284afa11cf9f7b619bca3c43ac
Merge branch 'develop' of https://github.com/friendica/friendica into develop