Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'
authoreal <eal@waifu.club>
Fri, 12 Jan 2018 20:57:31 +0000 (20:57 +0000)
committereal <eal@waifu.club>
Fri, 12 Jan 2018 20:57:31 +0000 (20:57 +0000)
added question about activating mediaproxy to config generator

See merge request pleroma/pleroma!44


Trivial merge