Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Wed, 18 Mar 2020 11:08:40 +0000 (14:08 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Wed, 18 Mar 2020 11:08:40 +0000 (14:08 +0300)

Trivial merge