Merge branch 'patch-1' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 21 Apr 2019 00:40:29 +0000 (00:40 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 21 Apr 2019 00:40:29 +0000 (00:40 +0000)
commite48848dad0bf02770e87ace1c4859e94c5c8e14d
tree323777563400efa69a06501f992a9c16f15f199e
parent6ca82c18a738205483dbbef2fd4de662d70227fb
parent25fa10499a8737a31ebd6abebd1362fe93fe8edd
Merge branch 'patch-1' into 'develop'

Mention Mastodon 2.8+ follow import fix in changelog

See merge request pleroma/pleroma!1079