Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into...
authorRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 16:34:14 +0000 (18:34 +0200)
committerRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 16:34:14 +0000 (18:34 +0200)

Trivial merge