diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-07-12 16:47:19 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-07-12 16:47:19 +0000 |
commit | ceffb910650a4653512e82ce2ac35314b8eb63cd (patch) | |
tree | 05d24c9ec86a4294d38ceb68b81066c6f9a71307 /lib/pleroma/web/common_api | |
parent | b1fcfcfae1ec4ba92307023e2bc448c3ef1f8bcc (diff) | |
parent | b806aa36c89f2f7359580c716f98d41b58cb87f9 (diff) | |
download | pleroma-ceffb910650a4653512e82ce2ac35314b8eb63cd.tar.gz |
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235
Diffstat (limited to 'lib/pleroma/web/common_api')
0 files changed, 0 insertions, 0 deletions