diff options
author | lain <lain@soykaf.club> | 2021-01-07 10:06:39 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2021-01-07 10:06:39 +0000 |
commit | f1ca2ac64bf5a308401f3155360e94a058e99e4e (patch) | |
tree | 283c7bdbeff9e3bb0a65b9cea1b459f76daaf88d /docs/configuration/howto_proxy.md | |
parent | 5e128a6be30563adc3b8a938aa68d18ac04cdfa0 (diff) | |
parent | 48cd336a720086695613decc2a1a6852245c1df5 (diff) | |
download | pleroma-f1ca2ac64bf5a308401f3155360e94a058e99e4e.tar.gz |
Merge branch 'upstream/remote-emoji-support' into 'develop'
Upstream external emoji support
See merge request pleroma/pleroma!3238
Diffstat (limited to 'docs/configuration/howto_proxy.md')
0 files changed, 0 insertions, 0 deletions