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

@ -20,7 +20,7 @@ export default Vue.extend({
},
mounted() {
(this as any).api('users/posts', {
user_id: this.user.id
userId: this.user.id
}).then(posts => {
this.posts = posts;
this.fetching = false;