diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-10-02 14:17:21 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-10-02 14:17:21 +0000 |
| commit | c5e937b156ea1f8f96ade7d9104fc2c5fd1dd9cd (patch) | |
| tree | dd5813a132b48071819ed9b987d9f0281cab0160 /docs/configuration/howto_mediaproxy.md | |
| parent | 433f2c0f6854d2838819e08f0fb0a9e8cf058021 (diff) | |
| parent | 9b68aab8b3cf576f91566cd659e4e5719dccb15a (diff) | |
| download | pleroma-c5e937b156ea1f8f96ade7d9104fc2c5fd1dd9cd.tar.gz pleroma-c5e937b156ea1f8f96ade7d9104fc2c5fd1dd9cd.zip | |
Merge branch 'split-masto-api/masto_fe_and_custom_emojis' into 'develop'
[#1278] Move actions from MastodonAPIController to CustomEmojiController and MastoFEController
See merge request pleroma/pleroma!1772
Diffstat (limited to 'docs/configuration/howto_mediaproxy.md')
0 files changed, 0 insertions, 0 deletions