Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 12 Jul 2018 16:47:19 +0000 (16:47 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 12 Jul 2018 16:47:19 +0000 (16:47 +0000)
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata

Closes #229

See merge request pleroma/pleroma!235


Trivial merge