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)
commitceffb910650a4653512e82ce2ac35314b8eb63cd
tree05d24c9ec86a4294d38ceb68b81066c6f9a71307
parentb1fcfcfae1ec4ba92307023e2bc448c3ef1f8bcc
parentb806aa36c89f2f7359580c716f98d41b58cb87f9
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'

[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata

Closes #229

See merge request pleroma/pleroma!235