summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/api_spec/operations/admin
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-10-13 19:25:18 -0500
committerAlex Gleason <alex@alexgleason.me>2020-10-13 19:25:18 -0500
commit7d8f610720abdadeff9238aa8a345a91e473e0fa (patch)
treec8fa941b0e0c0c7dd84888c4ae61e030f728b504 /lib/pleroma/web/api_spec/operations/admin
parent5ec7d88b77360ed78f75be6b1f94895c3f602972 (diff)
parent481906207e6d803e5c4d3e455c7b93119e392177 (diff)
downloadpleroma-7d8f610720abdadeff9238aa8a345a91e473e0fa.tar.gz
pleroma-7d8f610720abdadeff9238aa8a345a91e473e0fa.zip
Merge remote-tracking branch 'upstream/develop' into aliases
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