summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/api_spec/operations/admin
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-10-13 19:20:00 -0500
committerAlex Gleason <alex@alexgleason.me>2020-10-13 19:20:00 -0500
commitc3112fd13a6af239b9dff0813e93266ec58f571e (patch)
tree7f2252d7a08e4a59b66e392b2732a1cdd8745758 /lib/pleroma/web/api_spec/operations/admin
parent66e00ace7c0708f2f9361bc6e1008ccea08cb6ef (diff)
parent481906207e6d803e5c4d3e455c7b93119e392177 (diff)
downloadpleroma-c3112fd13a6af239b9dff0813e93266ec58f571e.tar.gz
pleroma-c3112fd13a6af239b9dff0813e93266ec58f571e.zip
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'lib/pleroma/web/api_spec/operations/admin')
-rw-r--r--lib/pleroma/web/api_spec/operations/admin/o_auth_app_operation.ex (renamed from lib/pleroma/web/api_spec/operations/admin/oauth_app_operation.ex)0
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/pleroma/web/api_spec/operations/admin/oauth_app_operation.ex b/lib/pleroma/web/api_spec/operations/admin/o_auth_app_operation.ex
index a75f3e622..a75f3e622 100644
--- a/lib/pleroma/web/api_spec/operations/admin/oauth_app_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/admin/o_auth_app_operation.ex