diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-08-05 13:08:31 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-08-05 13:08:31 -0500 |
| commit | cc196e2cd57966889021342405ebc8fd0763e83a (patch) | |
| tree | 232051460624a0fd0720ed04cc5512208ce1989b /test/web/mastodon_api/controllers/instance_controller_test.exs | |
| parent | ad9c925efb77287316f5dbac26f6a1b16662910a (diff) | |
| parent | 7755f49e281e4990db5317b33d6b8e0d12982e0c (diff) | |
| download | pleroma-cc196e2cd57966889021342405ebc8fd0763e83a.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into restrict-domain
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" => _, |