Merge branch 'develop' into 'openapi/admin/relay'

Browse source

# Conflicts:
#   lib/pleroma/web/admin_api/controllers/admin_api_controller.ex

...

This commit is contained in:

minibikini 2020-06-04 13:29:32 +00:00

parent 70f054b083 f5cb1f3616

commit b57e4ad1ab

6 changed files with 1588 additions and 1350 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1220

test/web/admin_api/controllers/admin_api_controller_test.exs

View file

File diff suppressed because it is too large Load diff

1290

test/web/admin_api/controllers/config_controller_test.exs Normal file

View file

File diff suppressed because it is too large Load diff