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)
commitd49109ca17f980e118cd5ab97bc1139e3bd14402
treec7eb73702c1fbee1cb27cb35252ef447a07cbb1f
parent5c09d8d3f199a3f323471f9ba4578371226cd726
parentd56ab43609985801c853b8743f4c33f691f59924
Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'

added question about activating mediaproxy to config generator

See merge request pleroma/pleroma!44