diff options
| author | Ilja <domainepublic@spectraltheorem.be> | 2020-09-25 23:47:08 +0200 |
|---|---|---|
| committer | Ilja <domainepublic@spectraltheorem.be> | 2020-09-25 23:47:08 +0200 |
| commit | 0411bdc748e4e64e1d653cb1a384a4e94d1682b1 (patch) | |
| tree | 8c47f52e33d03be2f28c907d0db87e27ec262acb /docs/configuration/howto_mediaproxy.md | |
| parent | 6446081a131df8194508b95898f220dbe077a45d (diff) | |
| parent | 35157f5dc845483e9d65236b87461f15c77ad634 (diff) | |
| download | pleroma-0411bdc748e4e64e1d653cb1a384a4e94d1682b1.tar.gz | |
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into simplePolicy_reasons_for_instance_specific_policies
Conflicts:
lib/pleroma/config/deprecation_warnings.ex
It looks like `:ok <- mrf_user_allowlist(),` was removed and this created conflicts
Diffstat (limited to 'docs/configuration/howto_mediaproxy.md')
0 files changed, 0 insertions, 0 deletions