Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
[akkoma] / installation /
drwxr-xr-x   ..
-rw-r--r-- 1011 pleroma.nginx
-rw-r--r-- 344 pleroma.service