summary refs log tree commit diff
path: root/api/src
diff options
context:
space:
mode:
authorTheArcaneBrony <myrainbowdash949@gmail.com>2022-08-13 22:14:22 +0200
committerTheArcaneBrony <myrainbowdash949@gmail.com>2022-08-15 06:13:50 +0200
commit6d3706c2c8efda6e170eac2081a60f41a09bb41f (patch)
treea40a7e505f9cf22a63d7bd1fa8c97b65e3122227 /api/src
parentDo the funny thing (make user->invite cascade delet) (diff)
downloadserver-6d3706c2c8efda6e170eac2081a60f41a09bb41f.tar.xz
Fix rebase conflicts
Diffstat (limited to '')
-rw-r--r--src/api/routes/applications/#id/bot/index.ts (renamed from api/src/routes/applications/#id/bot/index.ts)0
-rw-r--r--src/api/routes/applications/#id/index.ts (renamed from api/src/routes/applications/#id/index.ts)0
-rw-r--r--src/api/routes/applications/#id/skus.ts (renamed from api/src/routes/applications/#id/skus.ts)0
3 files changed, 0 insertions, 0 deletions
diff --git a/api/src/routes/applications/#id/bot/index.ts b/src/api/routes/applications/#id/bot/index.ts

index 5cae5215..5cae5215 100644 --- a/api/src/routes/applications/#id/bot/index.ts +++ b/src/api/routes/applications/#id/bot/index.ts
diff --git a/api/src/routes/applications/#id/index.ts b/src/api/routes/applications/#id/index.ts
index 0aced582..0aced582 100644 --- a/api/src/routes/applications/#id/index.ts +++ b/src/api/routes/applications/#id/index.ts
diff --git a/api/src/routes/applications/#id/skus.ts b/src/api/routes/applications/#id/skus.ts
index 5b667f36..5b667f36 100644 --- a/api/src/routes/applications/#id/skus.ts +++ b/src/api/routes/applications/#id/skus.ts