diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:35:15 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-08-07 16:35:15 -0500 |
| commit | 1a5a7ba6e8a936d3138ca530d3466111e542aef6 (patch) | |
| tree | c056138ee21661af45d2363ce01282aafffb3fc0 /test/web/mastodon_api/controllers/instance_controller_test.exs | |
| parent | bd1e2e3a58ebd702306e7a6e2df985ac07e5f7d8 (diff) | |
| parent | 47698fc322da58894dd41c1bfd5ca0376200dc5e (diff) | |
| download | pleroma-1a5a7ba6e8a936d3138ca530d3466111e542aef6.tar.gz pleroma-1a5a7ba6e8a936d3138ca530d3466111e542aef6.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
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" => _, |