Merge remote-tracking branch 'parent/main' into kb-upstream-20231018

This commit is contained in:
KMY 2023-10-18 11:13:56 +09:00
commit 527ded889d
32 changed files with 556 additions and 586 deletions

View file

@ -111,7 +111,7 @@ services:
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
## Uncomment to enable federation with tor instances along with adding the following ENV variables
## http_proxy=http://privoxy:8118
## http_hidden_proxy=http://privoxy:8118
## ALLOW_ACCESS_TO_HIDDEN_SERVICE=true
# tor:
# image: sirboops/tor