diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-17 12:13:36 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-17 19:48:33 +0300 |
| commit | 22d49993d9ab35ff5d5276a6a1f4aec96d03b7f3 (patch) | |
| tree | 957224ba165c8fa73fa5f7dcfe7b97bcf7e35d1d /test/web/media_proxy/media_proxy_controller_test.exs | |
| parent | eff7f9892dbb042a447fd83e1ce5e9cb69941cf6 (diff) | |
| download | pleroma-22d49993d9ab35ff5d5276a6a1f4aec96d03b7f3.tar.gz pleroma-22d49993d9ab35ff5d5276a6a1f4aec96d03b7f3.zip | |
Merge branch 'bugfix/mrf-ingestion' into 'develop'
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
Diffstat (limited to 'test/web/media_proxy/media_proxy_controller_test.exs')
0 files changed, 0 insertions, 0 deletions