From: lambda <pleromagit@rogerbraun.net>
Date: Thu, 12 Jul 2018 16:47:19 +0000 (+0000)
Subject: Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ceffb910650a4653512e82ce2ac35314b8eb63cd;p=akkoma

Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'

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

Closes #229

See merge request pleroma/pleroma!235
---

ceffb910650a4653512e82ce2ac35314b8eb63cd