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

@ -29,7 +29,7 @@ export default Vue.extend({
ok() {
this.wait = true;
(this as any).api('posts/create', {
repost_id: this.post.id
repostId: this.post.id
}).then(data => {
this.$emit('posted');
(this as any).apis.notify('%i18n:desktop.tags.mk-repost-form.success%');