Resolve conflicts

This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View file

@ -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: