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)
commit89a8dc748525063afc673e49875d0b605df73d77
tree3ebd4168d28de0abb3573825f50047d320ac2f17
parent44f7154fb97f29ae519afb8581c4379674c9f574
parentf86fca682a1a4ca71169003b714cc3ad104c411d
Merge branch 'patch-1' into 'develop'

fix mix typo in README.md

See merge request pleroma/pleroma!31