Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats
authorRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 06:49:26 +0000 (08:49 +0200)
committerRoger Braun <roger@rogerbraun.net>
Wed, 26 Apr 2017 06:49:26 +0000 (08:49 +0200)

Trivial merge