Merge branch 'patch-1' into 'develop'
authoreal <eal@waifu.club>
Sat, 25 Nov 2017 23:10:43 +0000 (23:10 +0000)
committereal <eal@waifu.club>
Sat, 25 Nov 2017 23:10:43 +0000 (23:10 +0000)
fix mix typo in README.md

See merge request pleroma/pleroma!31


Trivial merge