diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-07-18 08:52:11 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-07-18 08:52:11 +0000 |
| commit | b7001ea9e72947596b60e080768be10b4cbae82b (patch) | |
| tree | eda8c988ce1a6a81f9d8275a07caed33aac78e1e /lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | |
| parent | d93789dfde3c44c76a56732088a897ddddfe9716 (diff) | |
| parent | 18cac1e36bd91e1554de1f495a7f178b27b2fbc3 (diff) | |
| download | pleroma-b7001ea9e72947596b60e080768be10b4cbae82b.tar.gz | |
Merge branch 'feature/media-description' into 'develop'
Feature/media description
Closes #174
See merge request pleroma/pleroma!255
Diffstat (limited to 'lib/pleroma/web/nodeinfo/nodeinfo_controller.ex')
0 files changed, 0 insertions, 0 deletions