diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-01-29 05:11:08 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-01-29 05:11:08 +0000 |
commit | ebb3496386c1e195b48bcdc9d72c4c30e60fe340 (patch) | |
tree | 47e7c0be6bcf4615e9dd3db7ad66a2f65757c69f /docs/Admin-API.md | |
parent | 009273fd6e4d14601ebd9f02f2fd797716f774ed (diff) | |
parent | 61d6715714fe9c2ce6bf4fe6afc353f7fe5502a6 (diff) | |
download | pleroma-ebb3496386c1e195b48bcdc9d72c4c30e60fe340.tar.gz pleroma-ebb3496386c1e195b48bcdc9d72c4c30e60fe340.zip |
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
Rich Media support, part 2.
See merge request pleroma/pleroma!719
Diffstat (limited to 'docs/Admin-API.md')
0 files changed, 0 insertions, 0 deletions