Merge branch 'develop' into feature/activitypub
authorRoger Braun <roger@rogerbraun.net>
Sat, 9 Dec 2017 10:00:56 +0000 (11:00 +0100)
committerRoger Braun <roger@rogerbraun.net>
Sat, 9 Dec 2017 10:00:56 +0000 (11:00 +0100)

Trivial merge