Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
authorRoman Chvanikov <chvanikoff@gmail.com>
Wed, 17 Apr 2019 09:58:08 +0000 (16:58 +0700)
committerRoman Chvanikov <chvanikoff@gmail.com>
Wed, 17 Apr 2019 09:58:08 +0000 (16:58 +0700)

Trivial merge