diff options
| author | feld <feld@feld.me> | 2020-09-18 18:38:20 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-09-18 18:38:20 +0000 |
| commit | 6c052bd5b6cc29d321b500654bd6b098d0e6c56a (patch) | |
| tree | 9357c0e0f653f8e35d63e32eb0faf090e600a816 /test/fixtures | |
| parent | 91ddd47e513c5fc343ffa9bea069801b0142a115 (diff) | |
| parent | a42880040574701000470fc1c2dbd6f7242c1a06 (diff) | |
| download | pleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.tar.gz pleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.zip | |
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
Diffstat (limited to 'test/fixtures')
| -rwxr-xr-x | test/fixtures/image.gif | bin | 0 -> 1001718 bytes |
| -rwxr-xr-x | test/fixtures/image.png | bin | 0 -> 104426 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/test/fixtures/image.gif b/test/fixtures/image.gif Binary files differnew file mode 100755 index 000000000..9df64778b --- /dev/null +++ b/test/fixtures/image.gif diff --git a/test/fixtures/image.png b/test/fixtures/image.png Binary files differnew file mode 100755 index 000000000..e999e8800 --- /dev/null +++ b/test/fixtures/image.png |
