minibikini b57e4ad1ab Merge branch 'develop' into 'openapi/admin/relay' ...

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

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

..

admin_api_controller.ex

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

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

config_controller.ex

Add OpenApi spec to AdminAPI.ConfigController

2020-05-28 23:11:12 +04:00

fallback_controller.ex

Add OpenAPI spec for AdminAPI.StatusController

2020-05-21 17:23:12 +04:00

invite_controller.ex

Add AdminAPI.InviteView

2020-05-26 15:21:33 +04:00

oauth_app_controller.ex

Add OpenAPI spec for AdminAPI.OAuthAppContoller

2020-05-25 22:04:06 +04:00

relay_controller.ex

Add OpenAPI spec for AdminAPI.RelayController

2020-05-25 16:51:16 +04:00

report_controller.ex

Add OpenAPI spec for AdminAPI.ReportController

2020-06-03 19:17:05 +04:00

status_controller.ex

Update OpenAPI spec for AdminAPI.StatusController

2020-06-02 19:08:09 +04:00