diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:26:04 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-10-13 19:26:04 -0500 |
| commit | 755f58168bb2b6b979c6f5d36f7eff56d2305911 (patch) | |
| tree | 52aa7cd750bb201e73adac56a6b67720aaa188e6 /lib/pleroma/web/api_spec/operations/admin | |
| parent | 9c672ecbb5d4477cd16d2139a2cb66d3923ac5c8 (diff) | |
| parent | 481906207e6d803e5c4d3e455c7b93119e392177 (diff) | |
| download | pleroma-755f58168bb2b6b979c6f5d36f7eff56d2305911.tar.gz pleroma-755f58168bb2b6b979c6f5d36f7eff56d2305911.zip | |
Merge remote-tracking branch 'upstream/develop' into restrict-domain
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 |