From bfc193d8cd9aecdb82d585e8b4e101deac60a5bb Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 29 Mar 2018 14:48:47 +0900 Subject: Resolve conflicts --- src/server/web/docs/api/endpoints/posts/create.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/web/docs/api/endpoints/posts/create.yaml') diff --git a/src/server/web/docs/api/endpoints/posts/create.yaml b/src/server/web/docs/api/endpoints/posts/create.yaml index 5e2307dab4..11d9f40c54 100644 --- a/src/server/web/docs/api/endpoints/posts/create.yaml +++ b/src/server/web/docs/api/endpoints/posts/create.yaml @@ -11,19 +11,19 @@ params: desc: ja: "投稿の本文" en: "The text of your post" - - name: "media_ids" + - name: "mediaIds" type: "id(DriveFile)[]" optional: true desc: ja: "添付するメディア(1~4つ)" en: "Media you want to attach (1~4)" - - name: "reply_id" + - name: "replyId" type: "id(Post)" optional: true desc: ja: "返信する投稿" en: "The post you want to reply" - - name: "repost_id" + - name: "repostId" type: "id(Post)" optional: true desc: @@ -45,7 +45,7 @@ params: en: "Choices of a poll" res: - - name: "created_post" + - name: "createdPost" type: "entity(Post)" optional: false desc: -- cgit v1.2.3-freya