summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/auth/session/show.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/api/endpoints/auth/session/show.ts
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/api/endpoints/auth/session/show.ts')
-rw-r--r--src/server/api/endpoints/auth/session/show.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/api/endpoints/auth/session/show.ts b/src/server/api/endpoints/auth/session/show.ts
index 73ac3185f6..869b714e71 100644
--- a/src/server/api/endpoints/auth/session/show.ts
+++ b/src/server/api/endpoints/auth/session/show.ts
@@ -23,17 +23,17 @@ import AuthSess, { pack } from '../../../models/auth-session';
* schema:
* type: object
* properties:
- * created_at:
+ * createdAt:
* type: string
* format: date-time
* description: Date and time of the session creation
- * app_id:
+ * appId:
* type: string
* description: Application ID
* token:
* type: string
* description: Session Token
- * user_id:
+ * userId:
* type: string
* description: ID of user who create the session
* app: