diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-29 12:43:39 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-29 12:43:39 -0500 |
| commit | d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5 (patch) | |
| tree | 43a18b75775223594f58860098e231068000b0d4 /test/web/mastodon_api/controllers/instance_controller_test.exs | |
| parent | 3b7c454418700ca36c0a71272f913ea8c6e464e9 (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5.tar.gz pleroma-d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5.zip | |
Merge remote-tracking branch 'upstream/develop' into hide-reactions
Diffstat (limited to 'test/web/mastodon_api/controllers/instance_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/instance_controller_test.exs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/web/mastodon_api/controllers/instance_controller_test.exs b/test/web/mastodon_api/controllers/instance_controller_test.exs index cc880d82c..6a9ccd979 100644 --- a/test/web/mastodon_api/controllers/instance_controller_test.exs +++ b/test/web/mastodon_api/controllers/instance_controller_test.exs @@ -27,6 +27,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do "thumbnail" => _, "languages" => _, "registrations" => _, + "approval_required" => _, "poll_limits" => _, "upload_limit" => _, "avatar_upload_limit" => _, |