diff options
| author | feld <feld@feld.me> | 2019-08-02 17:07:09 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-08-02 17:07:09 +0000 |
| commit | 5eec0abe09ad49ffe7ff986ab28f54bddd6f3499 (patch) | |
| tree | f4e1af0a781f7fef4523122bafd1cf19ff95d6ba /docker-entrypoint.sh | |
| parent | 5ff8f07ca906d77a6ec1d5ba912a787f855364f9 (diff) | |
| parent | d93d7779151c811e991e99098e64c1da2c783d68 (diff) | |
| download | pleroma-5eec0abe09ad49ffe7ff986ab28f54bddd6f3499.tar.gz pleroma-5eec0abe09ad49ffe7ff986ab28f54bddd6f3499.zip | |
Merge branch 'fix/mediaproxy-whitelist-base_url' into 'develop'
Fix/mediaproxy whitelist base url
See merge request pleroma/pleroma!1486
Diffstat (limited to 'docker-entrypoint.sh')
0 files changed, 0 insertions, 0 deletions