Merge branch 'develop' of https://github.com/friendica/friendica into redis_serialize
authorPhilipp Holzer <admin@philipp.info>
Sun, 8 Jul 2018 11:36:05 +0000 (13:36 +0200)
committerPhilipp Holzer <admin@philipp.info>
Sun, 8 Jul 2018 11:36:05 +0000 (13:36 +0200)

Trivial merge