diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-29 13:01:16 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-29 13:01:16 -0500 |
| commit | 702f0fb822d40f0e004df1cdf3d9c2079ddc98e5 (patch) | |
| tree | 0dd822004be00402b84a9537506b9de3fd0bf5b6 /test/web/mastodon_api/controllers/instance_controller_test.exs | |
| parent | 93638935d783c092dabac51982426ebd98a21e0e (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-702f0fb822d40f0e004df1cdf3d9c2079ddc98e5.tar.gz pleroma-702f0fb822d40f0e004df1cdf3d9c2079ddc98e5.zip | |
Merge remote-tracking branch 'upstream/develop' into mrf-silence
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" => _, |