diff options
author | lambda <pleromagit@rogerbraun.net> | 2018-11-13 15:15:05 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2018-11-13 15:15:05 +0000 |
commit | a43195bdaa295f624315cba9daad42097de0cfe7 (patch) | |
tree | c22a5d599bb619ce640ac5b790d46eac2d95982d /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 22d20c497b813cdaedddb40a46df2f597311b235 (diff) | |
parent | 9b553a1087a3539280a4a085bcf7a79f29972f0a (diff) | |
download | pleroma-a43195bdaa295f624315cba9daad42097de0cfe7.tar.gz |
Merge branch 'media-proxy-safety' into 'develop'
media_proxy: CSP, content-disposition
See merge request pleroma/pleroma!448
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
0 files changed, 0 insertions, 0 deletions