Merge branch 'develop' into feature/gen-magic
authorMark Felder <feld@FreeBSD.org>
Fri, 9 Oct 2020 16:26:10 +0000 (11:26 -0500)
committerMark Felder <feld@FreeBSD.org>
Fri, 9 Oct 2020 16:26:10 +0000 (11:26 -0500)
commit04b514c567aa664d2606313d17be69e665a7f1af
tree13f46fd39d8a90837b031b1081b7e20696d6823a
parent55562ca9362d66553ea3638c91174bbeb6c637f1
parentd239bd3ca4348d38c12ab54c7e2e9cb2b825cc3c
Merge branch 'develop' into feature/gen-magic
13 files changed:
.gitlab-ci.yml
CHANGELOG.md
config/config.exs
config/description.exs
docs/installation/alpine_linux_en.md
docs/installation/arch_linux_en.md
docs/installation/debian_based_en.md
docs/installation/debian_based_jp.md
docs/installation/gentoo_en.md
docs/installation/otp_en.md
lib/pleroma/application.ex
mix.exs
mix.lock