diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-21 08:20:50 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-21 08:20:50 +0300 |
commit | bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1 (patch) | |
tree | 307120b8958a5be8dad4a16e6e2ff779336a30e3 /lib/pleroma/web/api_spec/helpers.ex | |
parent | f7e623c11c4b6f4f323a4317e9489092be73f9cd (diff) | |
parent | e57c1b60e4a0f882d5217bf1be8b1a7240aa322d (diff) | |
download | pleroma-bb5d0eafa437c9d32cdd8ccdb92b2eabb8ccccf1.tar.gz |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/api_spec/helpers.ex')
-rw-r--r-- | lib/pleroma/web/api_spec/helpers.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/api_spec/helpers.ex b/lib/pleroma/web/api_spec/helpers.ex index 35cf4c0d8..7348dcbee 100644 --- a/lib/pleroma/web/api_spec/helpers.ex +++ b/lib/pleroma/web/api_spec/helpers.ex @@ -4,7 +4,7 @@ defmodule Pleroma.Web.ApiSpec.Helpers do def request_body(description, schema_ref, opts \\ []) do - media_types = ["application/json", "multipart/form-data"] + media_types = ["application/json", "multipart/form-data", "application/x-www-form-urlencoded"] content = media_types |