projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f9ece1a a702f9f)
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)
#2209 RemoteIP CIDR helper, config and doc improvements

See merge request pleroma/pleroma!3057

1  2 
config/description.exs patch | diff1 | diff2 | blob | history

diff --cc config/description.exs
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git