Merge remote-tracking branch 'upstream/develop' into media-proxy

diff --cc installation/pleroma.nginx
index d882908e4c8347024ca4d1acf961ef3a2804ab77,6cf9f3fa0665d3fa4fd47d6d7410775cd32d51f0..4e88a426ddfc162887e2c49b86879c54c576daab
--- 1/installation/pleroma.nginx
--- 2/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@@ -22,15 -19,11 +22,18 @@@ server 
      server_name example.tld;
  
      location / {
+         proxy_http_version 1.1;
+         proxy_set_header Upgrade $http_upgrade;
+         proxy_set_header Connection "upgrade";
          proxy_pass http://localhost:4000;
      }
 +
 +    location /proxy {
 +        proxy_cache pleroma_media_cache;
 +        proxy_cache_lock on;
 +        proxy_pass http://localhost:4000;
 +    }
 +
      include snippets/well-known.conf;
  
 -}
 +}