Merge branch 'develop' into feature/gen-magic
authorMark Felder <feld@FreeBSD.org>
Thu, 10 Sep 2020 21:02:11 +0000 (16:02 -0500)
committerMark Felder <feld@FreeBSD.org>
Thu, 10 Sep 2020 21:05:22 +0000 (16:05 -0500)
commit55562ca9362d66553ea3638c91174bbeb6c637f1
treebb0b57d0a40dec779b0bfbfcbf65f3b9d3bea2b3
parent39f7fc5b8ef781c98136d1f9be50a14bff394233
parent6316350918d1f55167fa384d55f385ff2c93e6bb
Merge branch 'develop' into feature/gen-magic
18 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
lib/pleroma/upload.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
mix.exs
mix.lock
test/upload_test.exs
test/web/activity_pub/activity_pub_controller_test.exs