Merge branch 'fix/2209-remoteip' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 8 Oct 2020 17:29:00 +0000 (17:29 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 8 Oct 2020 17:29:00 +0000 (17:29 +0000)
commit74be4de3f6c2c34447029649526637411acfa9f3
treec221ef7a67c9b8ebd6e7d1c4fd5523fda6b8b0f7
parentf9ece1a7f65dc13a867c40ccf08f8973e822e6f2
parenta702f9fb5bff78c99014838eb8f678c30913bd59
Merge branch 'fix/2209-remoteip' into 'develop'

#2209 RemoteIP CIDR helper, config and doc improvements

See merge request pleroma/pleroma!3057
config/description.exs